From: Laurent Pinchart Date: Mon, 12 Dec 2011 00:15:06 +0000 (+0100) Subject: spi: Fix device unregistration when unregistering the bus master X-Git-Tag: v3.3-rc1~172^2~1 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=178db7d30f94707efca1a189753c105ef69942ed;p=linux-2.6-block.git spi: Fix device unregistration when unregistering the bus master Device are added as children of the bus master's parent device, but spi_unregister_master() looks for devices to unregister in the bus master's children. This results in the child devices not being unregistered. Fix this by registering devices as direct children of the bus master. Signed-off-by: Laurent Pinchart Signed-off-by: Grant Likely --- diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index 77eae99af11c..b2ccdea30cb9 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c @@ -319,7 +319,7 @@ struct spi_device *spi_alloc_device(struct spi_master *master) } spi->master = master; - spi->dev.parent = dev; + spi->dev.parent = &master->dev; spi->dev.bus = &spi_bus_type; spi->dev.release = spidev_release; device_initialize(&spi->dev);