From 2b03b60e6b8635fffdd15d5d24943950f2bbf96e Mon Sep 17 00:00:00 2001 From: Dmitry Torokhov Date: Sun, 5 Nov 2006 22:39:56 -0500 Subject: Input: keyboards - handle errors when registering input devices Signed-off-by: Dmitry Torokhov --- drivers/input/keyboard/maple_keyb.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'drivers/input/keyboard/maple_keyb.c') diff --git a/drivers/input/keyboard/maple_keyb.c b/drivers/input/keyboard/maple_keyb.c index cc6aaf9e85b..99836b3af47 100644 --- a/drivers/input/keyboard/maple_keyb.c +++ b/drivers/input/keyboard/maple_keyb.c @@ -94,13 +94,13 @@ static int dc_kbd_connect(struct maple_device *dev) struct input_dev *input_dev; unsigned long data = be32_to_cpu(dev->devinfo.function_data[0]); int i; + int err; dev->private_data = kbd = kzalloc(sizeof(struct dc_kbd), GFP_KERNEL); input_dev = input_allocate_device(); if (!kbd || !input_dev) { - kfree(kbd); - input_free_device(input_dev); - return -ENOMEM; + err = -ENOMEM; + goto fail; } kbd->dev = input_dev; @@ -113,10 +113,16 @@ static int dc_kbd_connect(struct maple_device *dev) set_bit(dc_kbd_keycode[i], input_dev->keybit); clear_bit(0, input_dev->keybit); - input_register_device(kbd->dev); + err = input_register_device(kbd->dev); + if (err) + goto fail; maple_getcond_callback(dev, dc_kbd_callback, 1, MAPLE_FUNC_KEYBOARD); return 0; + + fail: input_free_device(input_dev); + kfree(kbd); + return err; } -- cgit v1.2.3