diff options
| author | Guenter Roeck <linux@roeck-us.net> | 2012-08-23 20:08:48 -0700 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-08-27 09:37:52 -0700 |
| commit | c68025bf0363a7b44be2de512a88a57d57e63d81 (patch) | |
| tree | 8dce4ffe6cdfdecb596242eafb64d1a93670f476 /drivers/spi | |
| parent | 154390dcf826dc97b9d338305db14582c32cb58a (diff) | |
| download | linux-c68025bf0363a7b44be2de512a88a57d57e63d81.tar.gz linux-c68025bf0363a7b44be2de512a88a57d57e63d81.tar.bz2 linux-c68025bf0363a7b44be2de512a88a57d57e63d81.zip | |
spi/tegra: Fix device remove function
The call to spi_unregister_master() in the device remove function frees device
memory, and with it any device local data. However, device local data is still
accessed after the call to spi_unregister_master().
Acquire a reference to the SPI master device and release it after cleanup is
complete to solve the problem.
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'drivers/spi')
| -rw-r--r-- | drivers/spi/spi-tegra.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/spi/spi-tegra.c b/drivers/spi/spi-tegra.c index ef52c1c6f5c5..e28445d8d27f 100644 --- a/drivers/spi/spi-tegra.c +++ b/drivers/spi/spi-tegra.c @@ -652,7 +652,7 @@ static int __devexit spi_tegra_remove(struct platform_device *pdev) struct spi_tegra_data *tspi; struct resource *r; - master = dev_get_drvdata(&pdev->dev); + master = spi_master_get(dev_get_drvdata(&pdev->dev)); tspi = spi_master_get_devdata(master); spi_unregister_master(master); @@ -668,6 +668,8 @@ static int __devexit spi_tegra_remove(struct platform_device *pdev) clk_put(tspi->clk); iounmap(tspi->base); + spi_master_put(master); + r = platform_get_resource(pdev, IORESOURCE_MEM, 0); release_mem_region(r->start, resource_size(r)); |