mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-24 01:41:39 +00:00
spi: free children in spi_unregister_master, not siblings
introduced by49dce689
("spi doesn't need class_device") and bad-fixed by350d0076
("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>
This commit is contained in:
parent
4e4438b865
commit
34860089c9
1 changed files with 3 additions and 6 deletions
|
@ -554,11 +554,9 @@ int spi_register_master(struct spi_master *master)
|
|||
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);
|
||||
|
|
Loading…
Reference in a new issue