path: root/drivers/spi
diff options
authorAndreas Larsson <>2013-02-13 14:23:24 +0100
committerGrant Likely <>2013-04-07 10:12:21 +0100
commit8ec5d84ef51cc64ed02bb9bf0e43a652178252c1 (patch)
tree03c1baca689bcd9b34cef525f7d7579a7e9662c5 /drivers/spi
parent446411e18b2cb17d153e45f634a3c9a79ada3ac2 (diff)
spi: Return error from of_spi_register_master on bad "cs-gpios" property
This makes sure that an error is returned on an incorrectly formed "cs-gpios" property, but reports success when the "cs-gpios" property is well formed or missing. When holes in the cs-gpios property phandle list is used to indicate that some other form of chipselect is to be used it is important that failure to read a broken "cs-gpios" property does not silently fail leading to the spi controller to use an unintended chipselect. Signed-off-by: Andreas Larsson <> Signed-off-by: Grant Likely <>
Diffstat (limited to 'drivers/spi')
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
index bcca66c5107f..3738e7cbff33 100644
--- a/drivers/spi/spi.c
+++ b/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,