diff options
author | Linus Walleij <linus.walleij@linaro.org> | 2018-09-04 15:39:30 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-10-20 09:47:05 +0200 |
commit | 26c0bac0c117d9ef59ec22ffd2e66c1d88886267 (patch) | |
tree | 3aa4eb4a41f87468aa55bd27462ccacbcd5ae03c /drivers/spi | |
parent | affb1840c5788a7d84d551515c9f923e32c4cee7 (diff) | |
download | linux-stable-26c0bac0c117d9ef59ec22ffd2e66c1d88886267.tar.gz linux-stable-26c0bac0c117d9ef59ec22ffd2e66c1d88886267.tar.bz2 linux-stable-26c0bac0c117d9ef59ec22ffd2e66c1d88886267.zip |
spi: gpio: Fix copy-and-paste error
[ Upstream commit 1723c3155f117ee6e00f28fadf6e9eda4fc85806 ]
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>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/spi')
-rw-r--r-- | drivers/spi/spi-gpio.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/spi/spi-gpio.c b/drivers/spi/spi-gpio.c index 6ae92d4dca19..3b518ead504e 100644 --- a/drivers/spi/spi-gpio.c +++ b/drivers/spi/spi-gpio.c @@ -287,8 +287,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", |