From: Matthew Wilcox <willy@parisc-linux.org>
Date: Mon, 3 Apr 2006 13:44:17 +0000 (+0000)
Subject: [PARISC] Fix up hil_kbd.c mismerge
X-Git-Tag: v2.6.17-rc3~27^2~4
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d668da80d613def981c573354e1853e38bd0698d;p=linux-2.6

[PARISC] Fix up hil_kbd.c mismerge

Signed-off-by: Matthew Wilcox <willy@parisc-linux.org>
Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
---

diff --git a/drivers/input/keyboard/hil_kbd.c b/drivers/input/keyboard/hil_kbd.c
index 1dca3cf42a..2e4abdc263 100644
--- a/drivers/input/keyboard/hil_kbd.c
+++ b/drivers/input/keyboard/hil_kbd.c
@@ -350,11 +350,11 @@ static int hil_kbd_connect(struct serio *serio, struct serio_driver *drv)
 	return 0;
  bail2:
 	serio_close(serio);
+	serio_set_drvdata(serio, NULL);
  bail1:
 	input_free_device(kbd->dev);
  bail0:
 	kfree(kbd);
-	serio_set_drvdata(serio, NULL);
 	return -EIO;
 }