diff options
| author | Simon Glass <sjg@chromium.org> | 2016-02-24 09:14:56 -0700 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2016-02-26 08:53:10 -0700 |
| commit | 0badb23d110c886cf25550325f36ce1eba1eb5e2 (patch) | |
| tree | 26e8ea35370c5d17180ddb96509ea1e97b8771d8 /drivers | |
| parent | ffe276d27a538ca410d697126c562a1ce0ac8bbc (diff) | |
| download | u-boot-imx-0badb23d110c886cf25550325f36ce1eba1eb5e2.zip u-boot-imx-0badb23d110c886cf25550325f36ce1eba1eb5e2.tar.gz u-boot-imx-0badb23d110c886cf25550325f36ce1eba1eb5e2.tar.bz2 | |
spi: Correct two error return values
When an error number is provided we should use it, not change it. This fixes
the SPI and SPI flash tests.
One of these is long-standing. The other seems to have been introduced by
commit 1e90d9fd (sf: Move read_id code to sf_ops).
Signed-off-by: Simon Glass <sjg@chromium.org>
Fixes: 1e90d9fd (sf: Move read_id code to sf_ops)
Reviewed-by: Jagan Teki <jteki@openedev.com>
Tested-by: Jagan Teki <jteki@openedev.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mtd/spi/sf_probe.c | 4 | ||||
| -rw-r--r-- | drivers/mtd/spi/spi_flash.c | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/drivers/mtd/spi/sf_probe.c b/drivers/mtd/spi/sf_probe.c index daa1d5b..7b29637 100644 --- a/drivers/mtd/spi/sf_probe.c +++ b/drivers/mtd/spi/sf_probe.c @@ -42,10 +42,8 @@ static int spi_flash_probe_slave(struct spi_flash *flash) } ret = spi_flash_scan(flash); - if (ret) { - ret = -EINVAL; + if (ret) goto err_read_id; - } #ifdef CONFIG_SPI_FLASH_MTD ret = spi_flash_mtd_register(flash); diff --git a/drivers/mtd/spi/spi_flash.c b/drivers/mtd/spi/spi_flash.c index 3c365d5..2ae2e3c 100644 --- a/drivers/mtd/spi/spi_flash.c +++ b/drivers/mtd/spi/spi_flash.c @@ -989,7 +989,7 @@ int spi_flash_scan(struct spi_flash *flash) ret = spi_flash_cmd(spi, CMD_READ_ID, idcode, sizeof(idcode)); if (ret) { printf("SF: Failed to get idcodes\n"); - return -EINVAL; + return ret; } #ifdef DEBUG |