Merge remote-tracking branch 'input/next'

[karo-tx-linux.git] / drivers / input / touchscreen / ad7879-spi.c

diff --git a/drivers/input/touchscreen/ad7879-spi.c b/drivers/input/touchscreen/ad7879-spi.c
index 606da5bd61150958afca42a472c230a6e70ad26e..1a7b1143536e1d4a68dd6fb9e1c85cf992afee04 100644 (file)
--- a/drivers/input/touchscreen/ad7879-spi.c
+++ b/drivers/input/touchscreen/ad7879-spi.c
@@ -142,7 +142,6 @@ static int ad7879_spi_remove(struct spi_device *spi)
        struct ad7879 *ts = spi_get_drvdata(spi);
 
        ad7879_remove(ts);
-       spi_set_drvdata(spi, NULL);
 
        return 0;
 }