summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorMatthew Wilcox <willy@parisc-linux.org>2006-04-03 13:44:17 +0000
committerKyle McMartin <kyle@hera.kernel.org>2006-04-21 22:20:34 +0000
commitd668da80d613def981c573354e1853e38bd0698d (patch)
tree756b7e8ede024123c1d487d165c5d7c68ef04d4a /drivers
parent8ea6947b4b9d918784fa6a1f93ca2882d94b71b6 (diff)
downloadop-kernel-dev-d668da80d613def981c573354e1853e38bd0698d.zip
op-kernel-dev-d668da80d613def981c573354e1853e38bd0698d.tar.gz
[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')
-rw-r--r--drivers/input/keyboard/hil_kbd.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/keyboard/hil_kbd.c b/drivers/input/keyboard/hil_kbd.c
index 1dca3cf..2e4abdc 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;
}
OpenPOWER on IntegriCloud