Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c4339ac7 authored by Michael Welling's avatar Michael Welling Committed by Mark Brown
Browse files

spi: omap2-mcspi: Handle error on gpio_request 



If a valid GPIO is specified but cannot be requested by the driver, print a
message and error out of omap2_mcspi_setup.

Signed-off-by: default avatarMichael Welling <mwelling@ieee.org>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent a06b430f

drivers/spi/spi-omap2-mcspi.c

+6 −3
Original line number Diff line number Diff line
@@ -1023,9 +1023,12 @@ static int omap2_mcspi_setup(struct spi_device *spi) 
	}



	if (gpio_is_valid(spi->cs_gpio)) {

		if (gpio_request(spi->cs_gpio, dev_name(&spi->dev)) == 0)

			gpio_direction_output(spi->cs_gpio,

			!(spi->mode & SPI_CS_HIGH));

		ret = gpio_request(spi->cs_gpio, dev_name(&spi->dev));

		if (ret) {

			dev_err(&spi->dev, "failed to request gpio\n");

			return ret;

		}

		gpio_direction_output(spi->cs_gpio, !(spi->mode & SPI_CS_HIGH));

	}



	ret = pm_runtime_get_sync(mcspi->dev);