summaryrefslogtreecommitdiff
path: root/drivers/mtd/spi/sf_probe.c
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2016-02-26 16:22:28 -0500
committerTom Rini <trini@konsulko.com>2016-02-26 16:22:28 -0500
commitd5c6144fe326e255e42ec273fc5d88f45cd61548 (patch)
tree470446ad6c9d5580b0ff778d5adc77ee05f6e1b8 /drivers/mtd/spi/sf_probe.c
parent38e65aeb70b72132c0d2ec0ed389f7fc8b7bdf4c (diff)
parent6796704b0dfb4f98cb4a026988e9739884812b5c (diff)
Merge git://git.denx.de/u-boot-dm
Diffstat (limited to 'drivers/mtd/spi/sf_probe.c')
-rw-r--r--drivers/mtd/spi/sf_probe.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/mtd/spi/sf_probe.c b/drivers/mtd/spi/sf_probe.c
index daa1d5b249..7b296378d2 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);