Merge tag 'arm64-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas...

[linux-2.6-block.git] / drivers / mfd / stmpe-spi.c

diff --git a/drivers/mfd/stmpe-spi.c b/drivers/mfd/stmpe-spi.c
index 973659f8abd965bf689e48d7a92bd4b38f8b8c11..a81badbaa917dac49260ae1e10c7b08ec0b1a524 100644 (file)
--- a/drivers/mfd/stmpe-spi.c
+++ b/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);
 }