diff options
| author | Mark Brown <broonie@kernel.org> | 2019-04-04 23:19:10 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-04-04 23:19:10 -0400 |
| commit | e1a7d1673062a6a9160b1fc94e1540b747398e01 (patch) | |
| tree | 77ed1ca15537d1ae04a6ab0ff6128567c0fa497e /drivers/spi/spi.c | |
| parent | 9fda6693335cd51b0a74cffaac266c83439f7efe (diff) | |
| parent | a026525d4e45e3d9690bffd0b05d018ff5638b5a (diff) | |
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) | |||
| 2199 | */ | 2199 | */ |
| 2200 | cs[i] = devm_gpiod_get_index_optional(dev, "cs", i, | 2200 | cs[i] = devm_gpiod_get_index_optional(dev, "cs", i, |
| 2201 | GPIOD_OUT_LOW); | 2201 | GPIOD_OUT_LOW); |
| 2202 | if (IS_ERR(cs[i])) | ||
| 2203 | return PTR_ERR(cs[i]); | ||
| 2202 | 2204 | ||
| 2203 | if (cs[i]) { | 2205 | if (cs[i]) { |
| 2204 | /* | 2206 | /* |