[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>
This commit is contained in:
parent
8ea6947b4b
commit
d668da80d6
1 changed files with 1 additions and 1 deletions
|
@ -350,11 +350,11 @@ static int hil_kbd_connect(struct serio *serio, struct serio_driver *drv)
|
||||||
return 0;
|
return 0;
|
||||||
bail2:
|
bail2:
|
||||||
serio_close(serio);
|
serio_close(serio);
|
||||||
|
serio_set_drvdata(serio, NULL);
|
||||||
bail1:
|
bail1:
|
||||||
input_free_device(kbd->dev);
|
input_free_device(kbd->dev);
|
||||||
bail0:
|
bail0:
|
||||||
kfree(kbd);
|
kfree(kbd);
|
||||||
serio_set_drvdata(serio, NULL);
|
|
||||||
return -EIO;
|
return -EIO;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue