From 7448f9d54def13315c4145823ac76dadfee097df Mon Sep 17 00:00:00 2001
From: Matthew Wilcox <willy@parisc-linux.org>
Date: Mon, 3 Apr 2006 13:44:17 +0000
Subject: [PATCH] --- yaml --- r: 26160 b: refs/heads/master c:
 d668da80d613def981c573354e1853e38bd0698d h: refs/heads/master v: v3

---
 [refs]                                 | 2 +-
 trunk/drivers/input/keyboard/hil_kbd.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 897d3f55210f..965f2eb373b3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8ea6947b4b9d918784fa6a1f93ca2882d94b71b6
+refs/heads/master: d668da80d613def981c573354e1853e38bd0698d
diff --git a/trunk/drivers/input/keyboard/hil_kbd.c b/trunk/drivers/input/keyboard/hil_kbd.c
index 1dca3cf42a54..2e4abdc26367 100644
--- a/trunk/drivers/input/keyboard/hil_kbd.c
+++ b/trunk/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;
 }