diff options
| author | Mark Brown <broonie@kernel.org> | 2019-09-15 05:32:06 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-09-15 05:32:06 -0400 |
| commit | b769c5ba8aedc395ed04abe6db84a556d28beec1 (patch) | |
| tree | dd00c955f899f65785d60c2b4673785c28054b30 /drivers/spi/spi-gpio.c | |
| parent | 262a2f33454fcecdc2032ca84d6fecdb08233468 (diff) | |
| parent | fdeae8f5a2e5eb3fcc9c295bfb28503c3abd4d6e (diff) | |
Merge branch 'spi-5.4' into spi-next
Diffstat (limited to 'drivers/spi/spi-gpio.c')
| -rw-r--r-- | drivers/spi/spi-gpio.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/spi/spi-gpio.c b/drivers/spi/spi-gpio.c index 9eb82150666e..1d3e23ec20a6 100644 --- a/drivers/spi/spi-gpio.c +++ b/drivers/spi/spi-gpio.c | |||
| @@ -290,10 +290,7 @@ static int spi_gpio_request(struct device *dev, struct spi_gpio *spi_gpio) | |||
| 290 | return PTR_ERR(spi_gpio->miso); | 290 | return PTR_ERR(spi_gpio->miso); |
| 291 | 291 | ||
| 292 | spi_gpio->sck = devm_gpiod_get(dev, "sck", GPIOD_OUT_LOW); | 292 | spi_gpio->sck = devm_gpiod_get(dev, "sck", GPIOD_OUT_LOW); |
| 293 | if (IS_ERR(spi_gpio->sck)) | 293 | return PTR_ERR_OR_ZERO(spi_gpio->sck); |
| 294 | return PTR_ERR(spi_gpio->sck); | ||
| 295 | |||
| 296 | return 0; | ||
| 297 | } | 294 | } |
| 298 | 295 | ||
| 299 | #ifdef CONFIG_OF | 296 | #ifdef CONFIG_OF |