Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

1 files changed, 1 insertions, 1 deletions

diff --git a/drivers/input/keyboard/hil_kbd.c b/drivers/input/keyboard/hil_kbd.c
index 1dca3cf42a54..2e4abdc26367 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;
 }