From bc40c3e7db27317faf40043ec0ae2275a296155a Mon Sep 17 00:00:00 2001 From: Dmitry Torokhov Date: Mon, 28 Aug 2006 14:21:42 +0200 Subject: [PATCH] --- yaml --- r: 36717 b: refs/heads/master c: b25a10631a81fca33a94d1f1f6960928d8e9ce63 h: refs/heads/master i: 36715: 328e164dd5e8280a688af68791340ab79a23f8ff v: v3 --- [refs] | 2 +- trunk/drivers/hwmon/hdaps.c | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 97abe3655433..acf442ee7cd6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c41bdb526bca5cda5be3de8c112f63c400bf990f +refs/heads/master: b25a10631a81fca33a94d1f1f6960928d8e9ce63 diff --git a/trunk/drivers/hwmon/hdaps.c b/trunk/drivers/hwmon/hdaps.c index 42b632889dd8..8e7b5607f5a1 100644 --- a/trunk/drivers/hwmon/hdaps.c +++ b/trunk/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: