diff --git a/[refs] b/[refs]
index 5818d121ebfe..e0a30bc519ff 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e9642d5e162c2a219f770cf4a52b4c6b622879bb
+refs/heads/master: e65ad41e3b3f28316565ad0061b8152a3a8227ba
diff --git a/trunk/drivers/mfd/stmpe-spi.c b/trunk/drivers/mfd/stmpe-spi.c
index 973659f8abd9..a81badbaa917 100644
--- a/trunk/drivers/mfd/stmpe-spi.c
+++ b/trunk/drivers/mfd/stmpe-spi.c
@@ -103,7 +103,7 @@ stmpe_spi_probe(struct spi_device *spi)
 
 static int stmpe_spi_remove(struct spi_device *spi)
 {
-	struct stmpe *stmpe = dev_get_drvdata(&spi->dev);
+	struct stmpe *stmpe = spi_get_drvdata(spi);
 
 	return stmpe_remove(stmpe);
 }