diff --git a/[refs] b/[refs]
index 8025f95724c3..4ffd19183438 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 24e491c21b4e214a980a5daf2a5bc80e8c410ce6
+refs/heads/master: 2f7badb9742f88e7307d9e823f40c8621ceaa1c4
diff --git a/trunk/drivers/input/touchscreen/wm831x-ts.c b/trunk/drivers/input/touchscreen/wm831x-ts.c
index e83410721e38..ac667e469b35 100644
--- a/trunk/drivers/input/touchscreen/wm831x-ts.c
+++ b/trunk/drivers/input/touchscreen/wm831x-ts.c
@@ -390,7 +390,6 @@ static __devexit int wm831x_ts_remove(struct platform_device *pdev)
 	input_unregister_device(wm831x_ts->input_dev);
 	kfree(wm831x_ts);
 
-	platform_set_drvdata(pdev, NULL);
 	return 0;
 }