From 914314de2bfef3ef8991b5556f81389688d441e4 Mon Sep 17 00:00:00 2001 From: Andreas Larsson Date: Wed, 13 Feb 2013 14:23:24 +0100 Subject: [PATCH] --- yaml --- r: 375493 b: refs/heads/master c: 8ec5d84ef51cc64ed02bb9bf0e43a652178252c1 h: refs/heads/master i: 375491: 81f37e1b7cbd3413c232cb2c1f2fe956e5ba29f4 v: v3 --- [refs] | 2 +- trunk/drivers/spi/spi.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 7642b4a71e20..95bd53cd01ad 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 446411e18b2cb17d153e45f634a3c9a79ada3ac2 +refs/heads/master: 8ec5d84ef51cc64ed02bb9bf0e43a652178252c1 diff --git a/trunk/drivers/spi/spi.c b/trunk/drivers/spi/spi.c index bcca66c5107f..3738e7cbff33 100644 --- a/trunk/drivers/spi/spi.c +++ b/trunk/drivers/spi/spi.c @@ -1067,8 +1067,11 @@ static int of_spi_register_master(struct spi_master *master) nb = of_gpio_named_count(np, "cs-gpios"); master->num_chipselect = max(nb, (int)master->num_chipselect); - if (nb < 1) + /* Return error only for an incorrectly formed cs-gpios property */ + if (nb == 0 || nb == -ENOENT) return 0; + else if (nb < 0) + return nb; cs = devm_kzalloc(&master->dev, sizeof(int) * master->num_chipselect,