diff options
| author | Matthew Wilcox <willy@parisc-linux.org> | 2006-04-03 15:44:17 +0200 |
|---|---|---|
| committer | Kyle McMartin <kyle@hera.kernel.org> | 2006-04-22 00:20:34 +0200 |
| commit | d668da80d613def981c573354e1853e38bd0698d (patch) | |
| tree | 756b7e8ede024123c1d487d165c5d7c68ef04d4a /drivers/input | |
| parent | [PARISC] defconfig updates (diff) | |
| download | linux-d668da80d613def981c573354e1853e38bd0698d.tar.xz linux-d668da80d613def981c573354e1853e38bd0698d.zip | |
[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')
| -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) 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; } |