diff options
author | Matthew Wilcox <willy@parisc-linux.org> | 2006-04-03 09:44:17 -0400 |
---|---|---|
committer | Kyle McMartin <kyle@hera.kernel.org> | 2006-04-21 18:20:34 -0400 |
commit | d668da80d613def981c573354e1853e38bd0698d (patch) | |
tree | 756b7e8ede024123c1d487d165c5d7c68ef04d4a /drivers/input/keyboard | |
parent | 8ea6947b4b9d918784fa6a1f93ca2882d94b71b6 (diff) |
[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>
Diffstat (limited to 'drivers/input/keyboard')
-rw-r--r-- | drivers/input/keyboard/hil_kbd.c | 2 |
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) | |||
350 | return 0; | 350 | return 0; |
351 | bail2: | 351 | bail2: |
352 | serio_close(serio); | 352 | serio_close(serio); |
353 | serio_set_drvdata(serio, NULL); | ||
353 | bail1: | 354 | bail1: |
354 | input_free_device(kbd->dev); | 355 | input_free_device(kbd->dev); |
355 | bail0: | 356 | bail0: |
356 | kfree(kbd); | 357 | kfree(kbd); |
357 | serio_set_drvdata(serio, NULL); | ||
358 | return -EIO; | 358 | return -EIO; |
359 | } | 359 | } |
360 | 360 | ||