Commit 49f3eacf authored Jul 19, 2012 by Mark Brown Committed by Kukjin Kim Jul 19, 2012

spi/s3c64xx: Fix handling of errors in gpio_request()



When gpio_request() fails the driver logged the failure but while it'd
try to print an error code in the non-DT case it didn't pass the error
code in so garbage would be logged and in the DT case the error wasn't
logged.

Further, in the non-DT case the error code was then overwritten with -EBUSY
depriving the caller of information and breaking automatic probe deferral
pushing back from the GPIO level.  Also reformat the non-DT log message
so it's not word wrapped and we can grep for it.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>

parent f9ed561e

drivers/spi/spi-s3c64xx.c

+5 −4

Original line number	Diff line number	Diff line
		@@ -896,9 +896,9 @@ static int s3c64xx_spi_setup(struct spi_device *spi)
		if (!spi_get_ctldata(spi)) {
		err = gpio_request(cs->line, dev_name(&spi->dev));
		if (err) {
		dev_err(&spi->dev, "request for slave select gpio "
		"line [%d] failed\n", cs->line);
		err = -EBUSY;
		dev_err(&spi->dev,
		"Failed to get /CS gpio [%d]: %d\n",
		cs->line, err);
		goto err_gpio_req;
		}
		spi_set_ctldata(spi, cs);
		@@ -1116,7 +1116,8 @@ static int s3c64xx_spi_parse_dt_gpio(struct s3c64xx_spi_driver_data *sdd)

		ret = gpio_request(gpio, "spi-bus");
		if (ret) {
		dev_err(dev, "gpio [%d] request failed\n", gpio);
		dev_err(dev, "gpio [%d] request failed: %d\n",
		gpio, ret);
		goto free_gpio;
		}
		}