projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
spl: Update ext functions to take an spl_image parameter
[oweals/u-boot.git]
/
drivers
/
mtd
/
spi
/
sf_probe.c
diff --git
a/drivers/mtd/spi/sf_probe.c
b/drivers/mtd/spi/sf_probe.c
index 0cafc291230c2aba8a76576d242b158e73dbd4fa..7b296378d2be4fa20a274219a63ae93fee95eae4 100644
(file)
--- 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);
}
ret = spi_flash_scan(flash);
- if (ret) {
- ret = -EINVAL;
+ if (ret)
goto err_read_id;
goto err_read_id;
- }
#ifdef CONFIG_SPI_FLASH_MTD
ret = spi_flash_mtd_register(flash);
#ifdef CONFIG_SPI_FLASH_MTD
ret = spi_flash_mtd_register(flash);
@@
-128,7
+126,7
@@
static int spi_flash_std_write(struct udevice *dev, u32 offset, size_t len,
#if defined(CONFIG_SPI_FLASH_SST)
if (flash->flags & SNOR_F_SST_WR) {
#if defined(CONFIG_SPI_FLASH_SST)
if (flash->flags & SNOR_F_SST_WR) {
- if (flash->spi->
op_mode_tx & SPI_OPM_TX_BP
)
+ if (flash->spi->
mode & SPI_TX_BYTE
)
return sst_write_bp(flash, offset, len, buf);
else
return sst_write_wp(flash, offset, len, buf);
return sst_write_bp(flash, offset, len, buf);
else
return sst_write_wp(flash, offset, len, buf);