aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input
diff options
context:
space:
mode:
authorHenrik Rydberg <rydberg@euromail.se>2012-07-05 14:55:24 -0400
committerHenrik Rydberg <rydberg@euromail.se>2012-07-05 14:59:37 -0400
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 37190ab1f817..3ad942ca8725 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,
1184 1184
1185 error = sysfs_create_group(&client->dev.kobj, &mxt_attr_group); 1185 error = sysfs_create_group(&client->dev.kobj, &mxt_attr_group);
1186 if (error) 1186 if (error)
1187 dev_warn(&client->dev, "error creating sysfs entries.\n"); 1187 goto err_unregister_device;
1188 1188
1189 return 0; 1189 return 0;
1190 1190
1191err_unregister_device:
1192 input_unregister_device(input_dev);
1193 input_dev = NULL;
1191err_free_irq: 1194err_free_irq:
1192 free_irq(client->irq, data); 1195 free_irq(client->irq, data);
1193err_free_object: 1196err_free_object: