| From foo@baz Thu Oct 18 11:08:34 CEST 2018 |
| From: Linus Walleij <linus.walleij@linaro.org> |
| Date: Tue, 4 Sep 2018 15:39:30 +0200 |
| Subject: spi: gpio: Fix copy-and-paste error |
| |
| From: Linus Walleij <linus.walleij@linaro.org> |
| |
| [ 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> |
| --- |
| drivers/spi/spi-gpio.c | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| --- a/drivers/spi/spi-gpio.c |
| +++ b/drivers/spi/spi-gpio.c |
| @@ -287,8 +287,8 @@ static int spi_gpio_request(struct devic |
| *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", |
