diff --git a/[refs] b/[refs]
index 9a1a4b0e0398..79d290873432 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e1e1658d2eeb06e09f9855bdf6edb93474eca0c0
+refs/heads/master: 639900380062ecd78ee8b265ea23929c565469b4
diff --git a/trunk/drivers/input/touchscreen/atmel_mxt_ts.c b/trunk/drivers/input/touchscreen/atmel_mxt_ts.c
index 926209cba77d..c72f595a3203 100644
--- a/trunk/drivers/input/touchscreen/atmel_mxt_ts.c
+++ b/trunk/drivers/input/touchscreen/atmel_mxt_ts.c
@@ -1172,13 +1172,10 @@ static int __devinit mxt_probe(struct i2c_client *client,
 
 	error = sysfs_create_group(&client->dev.kobj, &mxt_attr_group);
 	if (error)
-		goto err_unregister_device;
+		dev_warn(&client->dev, "error creating sysfs entries.\n");
 
 	return 0;
 
-err_unregister_device:
-	input_unregister_device(input_dev);
-	input_dev = NULL;
 err_free_irq:
 	free_irq(client->irq, data);
 err_free_object: