summaryrefslogtreecommitdiff
path: root/drivers/spi/spi.c
diff options
context:
space:
mode:
authorDavid Lamparter <equinox@diac24.net>2010-08-30 23:54:17 +0200
committerGrant Likely <grant.likely@secretlab.ca>2010-09-01 09:15:24 -0600
commit34860089c9e8abcc77428d29743b37ff756197e7 (patch)
treec52ff089b36289ee4792d850acf0af9eb246b135 /drivers/spi/spi.c
parent4e4438b86527e8bf1f49503a30d487e401e64f9c (diff)
downloadlinux-3.10-34860089c9e8abcc77428d29743b37ff756197e7.tar.gz
linux-3.10-34860089c9e8abcc77428d29743b37ff756197e7.tar.bz2
linux-3.10-34860089c9e8abcc77428d29743b37ff756197e7.zip
spi: free children in spi_unregister_master, not siblings
introduced by 49dce689 ("spi doesn't need class_device") and bad-fixed by 350d0076 ("spi: fix double-free on spi_unregister_master"), spi_unregister_master would previously device_unregister all of the spi master's siblings (instead of its children). hilarity ensues. fix it to unregister children. Signed-off-by: David Lamparter <equinox@diac24.net> Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Diffstat (limited to 'drivers/spi/spi.c')
-rw-r--r--drivers/spi/spi.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
index a9e5c79ae52..0bcf4c1601a 100644
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@ -554,11 +554,9 @@ done:
EXPORT_SYMBOL_GPL(spi_register_master);
-static int __unregister(struct device *dev, void *master_dev)
+static int __unregister(struct device *dev, void *null)
{
- /* note: before about 2.6.14-rc1 this would corrupt memory: */
- if (dev != master_dev)
- spi_unregister_device(to_spi_device(dev));
+ spi_unregister_device(to_spi_device(dev));
return 0;
}
@@ -576,8 +574,7 @@ void spi_unregister_master(struct spi_master *master)
{
int dummy;
- dummy = device_for_each_child(master->dev.parent, &master->dev,
- __unregister);
+ dummy = device_for_each_child(&master->dev, NULL, __unregister);
device_unregister(&master->dev);
}
EXPORT_SYMBOL_GPL(spi_unregister_master);