From: Saravana Kannan Date: Wed, 5 May 2021 16:47:34 +0000 (-0700) Subject: spi: Don't have controller clean up spi device before driver unbind X-Git-Tag: v5.4.126~52 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=85a7998e72110ecabc343fbf14ac63a5a97e80da;p=users%2Fdwmw2%2Flinux.git spi: Don't have controller clean up spi device before driver unbind [ Upstream commit 27e7db56cf3dffd302bd7ddfacb1d405cf671a2a ] When a spi device is unregistered and triggers a driver unbind, the driver might need to access the spi device. So, don't have the controller clean up the spi device before the driver is unbound. Clean up the spi device after the driver is unbound. Fixes: c7299fea6769 ("spi: Fix spi device unregister flow") Reported-by: Lukas Wunner Signed-off-by: Saravana Kannan Tested-by: Andy Shevchenko Link: https://lore.kernel.org/r/20210505164734.175546-1-saravanak@google.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index c4b80cf825b8b..f8f3434d5ab1e 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c @@ -708,15 +708,15 @@ void spi_unregister_device(struct spi_device *spi) if (!spi) return; - spi_cleanup(spi); - if (spi->dev.of_node) { of_node_clear_flag(spi->dev.of_node, OF_POPULATED); of_node_put(spi->dev.of_node); } if (ACPI_COMPANION(&spi->dev)) acpi_device_clear_enumerated(ACPI_COMPANION(&spi->dev)); - device_unregister(&spi->dev); + device_del(&spi->dev); + spi_cleanup(spi); + put_device(&spi->dev); } EXPORT_SYMBOL_GPL(spi_unregister_device);