diff options
author | Dan Carpenter <dan.carpenter@oracle.com> | 2016-10-13 04:30:39 -0400 |
---|---|---|
committer | Cyrille Pitchen <cyrille.pitchen@atmel.com> | 2016-11-26 10:50:13 -0500 |
commit | 10ad1d754a434c024ce7eeb1cec9f69fd3ecc863 (patch) | |
tree | ae6dabf42c7dd13a1255ea5893a7f9c1dff62be2 | |
parent | 193e87143c290ec16838f5368adc0e0bc94eb931 (diff) |
mtd: spi-nor: Fix some error codes in cqspi_setup_flash()
We return success or possibly uninitialized values on these error paths
instead of proper error codes.
Fixes: 140623410536 ("mtd: spi-nor: Add driver for Cadence Quad SPI Flash Controller")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: Marek Vasut <marex@denx.de>
Reviewed-by: Moritz Fischer <moritz.fischer@ettus.com>
Signed-off-by: Cyrille Pitchen <cyrille.pitchen@atmel.com>
-rw-r--r-- | drivers/mtd/spi-nor/cadence-quadspi.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/mtd/spi-nor/cadence-quadspi.c b/drivers/mtd/spi-nor/cadence-quadspi.c index 944863be0320..d489fbd07c12 100644 --- a/drivers/mtd/spi-nor/cadence-quadspi.c +++ b/drivers/mtd/spi-nor/cadence-quadspi.c | |||
@@ -1077,12 +1077,14 @@ static int cqspi_setup_flash(struct cqspi_st *cqspi, struct device_node *np) | |||
1077 | 1077 | ||
1078 | /* Get flash device data */ | 1078 | /* Get flash device data */ |
1079 | for_each_available_child_of_node(dev->of_node, np) { | 1079 | for_each_available_child_of_node(dev->of_node, np) { |
1080 | if (of_property_read_u32(np, "reg", &cs)) { | 1080 | ret = of_property_read_u32(np, "reg", &cs); |
1081 | if (ret) { | ||
1081 | dev_err(dev, "Couldn't determine chip select.\n"); | 1082 | dev_err(dev, "Couldn't determine chip select.\n"); |
1082 | goto err; | 1083 | goto err; |
1083 | } | 1084 | } |
1084 | 1085 | ||
1085 | if (cs >= CQSPI_MAX_CHIPSELECT) { | 1086 | if (cs >= CQSPI_MAX_CHIPSELECT) { |
1087 | ret = -EINVAL; | ||
1086 | dev_err(dev, "Chip select %d out of range.\n", cs); | 1088 | dev_err(dev, "Chip select %d out of range.\n", cs); |
1087 | goto err; | 1089 | goto err; |
1088 | } | 1090 | } |