Merge branch 'spi-5.1' into spi-5.2

2019-04-05 10:19:10 +07:00
parent 9fda669333 a026525d4e
commit e1a7d16730
7 changed files with 173 additions and 71 deletions
--- 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]) {
 			/*