summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2018-09-04 15:39:30 +0200
committerMark Brown <broonie@kernel.org>2018-09-04 17:21:17 +0100
commit1723c3155f117ee6e00f28fadf6e9eda4fc85806 (patch)
tree1d185997127f78f6fe4d16363e929978d376a0db /drivers
parent7001cab1dabc0b72b2b672ef58a90ab64f5e2343 (diff)
downloadlinux-stable-1723c3155f117ee6e00f28fadf6e9eda4fc85806.tar.gz
linux-stable-1723c3155f117ee6e00f28fadf6e9eda4fc85806.tar.bz2
linux-stable-1723c3155f117ee6e00f28fadf6e9eda4fc85806.zip
spi: gpio: Fix copy-and-paste error
This fixes an embarrassing copy-and-paste error in the errorpath of spi_gpio_request(): we were checking the wrong struct member for error code right after retrieveing the sck GPIO. Fixes: 9b00bc7b901ff672 ("spi: spi-gpio: Rewrite to use GPIO descriptors") Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be> Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/spi/spi-gpio.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/spi/spi-gpio.c b/drivers/spi/spi-gpio.c
index 0626e6e3ea0c..421bfc7dda67 100644
--- a/drivers/spi/spi-gpio.c
+++ b/drivers/spi/spi-gpio.c
@@ -300,8 +300,8 @@ static int spi_gpio_request(struct device *dev,
*mflags |= SPI_MASTER_NO_RX;
spi_gpio->sck = devm_gpiod_get(dev, "sck", GPIOD_OUT_LOW);
- if (IS_ERR(spi_gpio->mosi))
- return PTR_ERR(spi_gpio->mosi);
+ if (IS_ERR(spi_gpio->sck))
+ return PTR_ERR(spi_gpio->sck);
for (i = 0; i < num_chipselects; i++) {
spi_gpio->cs_gpios[i] = devm_gpiod_get_index(dev, "cs",