diff options
| author |   Mark Brown <broonie@kernel.org> | 2019-04-05 10:19:10 +0700 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-04-05 10:19:10 +0700 |
| commit | e1a7d1673062a6a9160b1fc94e1540b747398e01 (patch) | |
| tree | 77ed1ca15537d1ae04a6ab0ff6128567c0fa497e /drivers/spi/spi.c | |
| parent | spi: sh-msiof: Convert to use GPIO descriptors (diff) | |
| parent | spi: tegra114: avoid reset call in atomic context (diff) | |
| download | linux-dev-e1a7d1673062a6a9160b1fc94e1540b747398e01.tar.xz linux-dev-e1a7d1673062a6a9160b1fc94e1540b747398e01.zip | |
Merge branch 'spi-5.1' into spi-5.2
Diffstat (limited to 'drivers/spi/spi.c')
| -rw-r--r-- | drivers/spi/spi.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index bd2a424672df..2ad20c735b61 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c @@ -2199,6 +2199,8 @@ static int spi_get_gpio_descs(struct spi_controller *ctlr) */ cs[i] = devm_gpiod_get_index_optional(dev, "cs", i, GPIOD_OUT_LOW); + if (IS_ERR(cs[i])) + return PTR_ERR(cs[i]); if (cs[i]) { /* |