From khali@linux-fr.org Mon Aug 28 05:21:49 2006 Date: Mon, 28 Aug 2006 14:21:42 +0200 From: Jean Delvare To: Greg KH Cc: LM Sensors , Dmitry Torokhov Subject: [PATCH 02/14] hdaps: Handle errors from input_register_device Message-Id: <20060828142142.d4dcad2c.khali@linux-fr.org> Content-Disposition: inline; filename=hwmon-hdaps-handle-errors-from-input-register-device.patch From: Dmitry Torokhov HDAPS: handle errors from input_register_device() Signed-off-by: Dmitry Torokhov Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman --- drivers/hwmon/hdaps.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) --- gregkh-2.6.orig/drivers/hwmon/hdaps.c +++ gregkh-2.6/drivers/hwmon/hdaps.c @@ -587,7 +587,9 @@ static int __init hdaps_init(void) input_set_abs_params(hdaps_idev, ABS_Y, -256, 256, HDAPS_INPUT_FUZZ, HDAPS_INPUT_FLAT); - input_register_device(hdaps_idev); + ret = input_register_device(hdaps_idev); + if (ret) + goto out_idev; /* start up our timer for the input device */ init_timer(&hdaps_timer); @@ -598,6 +600,8 @@ static int __init hdaps_init(void) printk(KERN_INFO "hdaps: driver successfully loaded.\n"); return 0; +out_idev: + input_free_device(hdaps_idev); out_group: sysfs_remove_group(&pdev->dev.kobj, &hdaps_attribute_group); out_device: