drivers/spi/spi.c: don't release the spi device twice
This was fixed by David Lamparter in v2.6.36-rc53486008
("spi: free children in spi_unregister_master, not siblings") and broken again in v2.6.37-rc1~2^2~4 during the merge of2b9603a0
("spi: enable spi_board_info to be registered after spi_master"). Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Signed-off-by: David Lamparter <equinox@diac24.net> Cc: Grant Likely <grant.likely@secretlab.ca> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
4be2c95d1f
commit
97dbf37d89
1 changed files with 1 additions and 2 deletions
|
@ -584,8 +584,7 @@ void spi_unregister_master(struct spi_master *master)
|
|||
list_del(&master->list);
|
||||
mutex_unlock(&board_lock);
|
||||
|
||||
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