OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
8ea6947
)
[PARISC] Fix up hil_kbd.c mismerge
author
Matthew Wilcox
<willy@parisc-linux.org>
Mon, 3 Apr 2006 13:44:17 +0000
(13:44 +0000)
committer
Kyle McMartin
<kyle@hera.kernel.org>
Fri, 21 Apr 2006 22:20:34 +0000
(22:20 +0000)
Signed-off-by: Matthew Wilcox <willy@parisc-linux.org>
Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
drivers/input/keyboard/hil_kbd.c
patch
|
blob
|
history
diff --git
a/drivers/input/keyboard/hil_kbd.c
b/drivers/input/keyboard/hil_kbd.c
index
1dca3cf
..
2e4abdc
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;
}