diff --git a/[refs] b/[refs]
index bd48c283aadf..8c6cd4fbfe44 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3f7c58a05fe4aa71983ea27959b7ad840950537e
+refs/heads/master: 017596b61f324946299fa94d9ef6f08b7478a3d8
diff --git a/trunk/drivers/input/touchscreen/wm97xx-core.c b/trunk/drivers/input/touchscreen/wm97xx-core.c
index 69af8385ab14..2957d48e0045 100644
--- a/trunk/drivers/input/touchscreen/wm97xx-core.c
+++ b/trunk/drivers/input/touchscreen/wm97xx-core.c
@@ -569,7 +569,7 @@ static int wm97xx_probe(struct device *dev)
 	mutex_init(&wm->codec_mutex);
 
 	wm->dev = dev;
-	dev->driver_data = wm;
+	dev_set_drvdata(dev, wm);
 	wm->ac97 = to_ac97_t(dev);
 
 	/* check that we have a supported codec */