Unverified Commit c914dbf8 authored by Joe Burmeister's avatar Joe Burmeister Committed by Mark Brown
Browse files

spi: Handle SPI device setup callback failure. 



If the setup callback failed, but the controller has auto_runtime_pm
and set_cs, the setup failure could be missed.

Signed-off-by: default avatarJoe Burmeister <joe.burmeister@devtank.co.uk>
Link: https://lore.kernel.org/r/20210419130631.4586-1-joe.burmeister@devtank.co.uk


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent d347b4aa

drivers/spi/spi.c

+8 −1
Original line number Diff line number Diff line
@@ -3378,8 +3378,15 @@ int spi_setup(struct spi_device *spi) 


	mutex_lock(&spi->controller->io_mutex);



	if (spi->controller->setup)

	if (spi->controller->setup) {

		status = spi->controller->setup(spi);

		if (status) {

			mutex_unlock(&spi->controller->io_mutex);

			dev_err(&spi->controller->dev, "Failed to setup device: %d\n",

				status);

			return status;

		}

	}



	if (spi->controller->auto_runtime_pm && spi->controller->set_cs) {

		status = pm_runtime_get_sync(spi->controller->dev.parent);