summaryrefslogtreecommitdiffstats
path: root/drivers/input
diff options
context:
space:
mode:
authorHenrik Rydberg <rydberg@euromail.se>2012-07-05 20:55:24 +0200
committerHenrik Rydberg <rydberg@euromail.se>2012-07-05 20:59:37 +0200
commitc45361a1287a74d327d72d4d2b96f4ac170653d9 (patch)
treedee893fd07dc42cdf658e8a8f6393caebd8e75f1 /drivers/input
parentcab7faca5e446b84e829d57d2095035d72edba09 (diff)
Revert "Input: atmel_mxt_ts - warn if sysfs could not be created"
Dmitry: I understand that I am a bit late to the party :) but I do not agree with this change. Failure to create attributes is not sometihng that user could cause (at least not easily) and thus would not be a setup issue but something more severe. I believe we should fail loading the driver so sysfs attribute breakage will be noticed as soon as possible, instead of discovering it much much later in the process. This reverts commit 639900380062ecd78ee8b265ea23929c565469b4. Requested-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/touchscreen/atmel_mxt_ts.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/input/touchscreen/atmel_mxt_ts.c b/drivers/input/touchscreen/atmel_mxt_ts.c
index 37190ab1f81..3ad942ca872 100644
--- a/drivers/input/touchscreen/atmel_mxt_ts.c
+++ b/drivers/input/touchscreen/atmel_mxt_ts.c
@@ -1184,10 +1184,13 @@ static int __devinit mxt_probe(struct i2c_client *client,
error = sysfs_create_group(&client->dev.kobj, &mxt_attr_group);
if (error)
- dev_warn(&client->dev, "error creating sysfs entries.\n");
+ goto err_unregister_device;
return 0;
+err_unregister_device:
+ input_unregister_device(input_dev);
+ input_dev = NULL;
err_free_irq:
free_irq(client->irq, data);
err_free_object: