[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 1dca3cf42a54c50209f80bb96e91bd4941244aa7..2e4abdc26367622c537bed24d99c2d92d8c83718 100644 (file)
--- 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;
 }