mirror of
https://github.com/Fishwaldo/u-boot.git
synced 2025-03-18 21:21:37 +00:00
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 commit1e90d9fd
(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>
This commit is contained in:
parent
ffe276d27a
commit
0badb23d11
2 changed files with 2 additions and 4 deletions
|
@ -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);
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Add table
Reference in a new issue