summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuenter Roeck <linux@roeck-us.net>2012-08-19 10:44:17 -0700
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-08-22 19:25:52 +0100
commit495e3ff365425f9b69884ddde36047184f37c2bd (patch)
tree1f057a6e63c9e48ed6bceb985e9108e608c88a0c
parenta93a2029de7c7f15eb33331cd0f8114892eaa0f3 (diff)
downloadlinux-3.10-495e3ff365425f9b69884ddde36047184f37c2bd.tar.gz
linux-3.10-495e3ff365425f9b69884ddde36047184f37c2bd.tar.bz2
linux-3.10-495e3ff365425f9b69884ddde36047184f37c2bd.zip
spi/pl022: Fix device remove function
The call sequence spi_alloc_master/spi_register_master/spi_unregister_master is complete; it reduces the device reference count to zero, which results in device memory being freed. An extra call to spi_master_put is unnecessary and results in an access to free memory. Drop it. Signed-off-by: Guenter Roeck <linux@roeck-us.net> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
-rw-r--r--drivers/spi/spi-pl022.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/spi/spi-pl022.c b/drivers/spi/spi-pl022.c
index aab518ec2bb..47c6753fb31 100644
--- a/drivers/spi/spi-pl022.c
+++ b/drivers/spi/spi-pl022.c
@@ -2171,7 +2171,6 @@ pl022_remove(struct amba_device *adev)
amba_release_regions(adev);
tasklet_disable(&pl022->pump_transfers);
spi_unregister_master(pl022->master);
- spi_master_put(pl022->master);
amba_set_drvdata(adev, NULL);
return 0;
}