Commit 10ad1d75 authored Oct 13, 2016 by Dan Carpenter Committed by Cyrille Pitchen Nov 26, 2016

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: 14062341 ("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>

parent 193e8714

drivers/mtd/spi-nor/cadence-quadspi.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -1077,12 +1077,14 @@ static int cqspi_setup_flash(struct cqspi_st cqspi, struct device_node np)

		/* Get flash device data */
		for_each_available_child_of_node(dev->of_node, np) {
		if (of_property_read_u32(np, "reg", &cs)) {
		ret = of_property_read_u32(np, "reg", &cs);
		if (ret) {
		dev_err(dev, "Couldn't determine chip select.\n");
		goto err;
		}

		if (cs >= CQSPI_MAX_CHIPSELECT) {
		ret = -EINVAL;
		dev_err(dev, "Chip select %d out of range.\n", cs);
		goto err;
		}