Commit 97dbf37d authored Dec 21, 2010 by Sebastian Andrzej Siewior Committed by Linus Torvalds Dec 22, 2010

drivers/spi/spi.c: don't release the spi device twice



This was fixed by David Lamparter in v2.6.36-rc5 34860089 ("spi: free
children in spi_unregister_master, not siblings") and broken again in
v2.6.37-rc1~2^2~4 during the merge of 2b9603a0 ("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>

parent 4be2c95d

drivers/spi/spi.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -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);

Admin message