From: Dmitry Torokhov Date: Thu, 17 Mar 2011 05:09:09 +0000 (-0700) Subject: Input: tsc2005 - clear driver data after unbinding X-Git-Tag: v2.6.39-rc1~410^2^2^2~11 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=2721a89ac41f2e7705484c1582c293c4eee5344d;p=~emulex%2Finfiniband.git Input: tsc2005 - clear driver data after unbinding We should not leave garbage pointers in driver structure after we unbind it from the device or if bind fails. Tested-by: Aaro Koskinen Signed-off-by: Dmitry Torokhov --- diff --git a/drivers/input/touchscreen/tsc2005.c b/drivers/input/touchscreen/tsc2005.c index 596fd1f01b2..732c81e9a3e 100644 --- a/drivers/input/touchscreen/tsc2005.c +++ b/drivers/input/touchscreen/tsc2005.c @@ -634,8 +634,10 @@ static int __devinit tsc2005_probe(struct spi_device *spi) spi_setup(spi); r = tsc2005_setup(ts, pdata); - if (r) + if (r) { kfree(ts); + spi_set_drvdata(spi, NULL); + } return r; } @@ -659,6 +661,7 @@ static int __devexit tsc2005_remove(struct spi_device *spi) input_unregister_device(ts->idev); kfree(ts); + spi_set_drvdata(spi, NULL); return 0; }