| Message ID | 20161205180910.9631-1-fparent@baylibre.com |
|---|---|
| State | Accepted |
| Commit | 304decdd31d54ae274f785fb086f3f6ae30a8711 |
| Headers | show |
On Mon, Dec 5, 2016 at 7:09 PM, Fabien Parent <fparent@baylibre.com> wrote: > In spi_flash_scan, 'ret' is initialled to -1, but 'ret' is not always > used to store a return value, in that case, even when the function > succeed, an error (-1) will be returned. > Lets just return 0 if we hit the end of the function. > > Signed-off-by: Fabien Parent <fparent@baylibre.com> Applied to u-boot-spi/master thanks! -- Jagan Teki Free Software Engineer | www.openedev.com U-Boot, Linux | Upstream Maintainer Hyderabad, India. _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
diff --git a/drivers/mtd/spi/spi_flash.c b/drivers/mtd/spi/spi_flash.c index 94c0b0063d..41fc0a6a24 100644 --- a/drivers/mtd/spi/spi_flash.c +++ b/drivers/mtd/spi/spi_flash.c @@ -1000,7 +1000,7 @@ int spi_flash_scan(struct spi_flash *flash) { struct spi_slave *spi = flash->spi; const struct spi_flash_info *info = NULL; - int ret = -1; + int ret; info = spi_flash_read_id(flash); if (IS_ERR_OR_NULL(info)) @@ -1166,5 +1166,5 @@ int spi_flash_scan(struct spi_flash *flash) } #endif - return ret; + return 0; }
In spi_flash_scan, 'ret' is initialled to -1, but 'ret' is not always used to store a return value, in that case, even when the function succeed, an error (-1) will be returned. Lets just return 0 if we hit the end of the function. Signed-off-by: Fabien Parent <fparent@baylibre.com> --- drivers/mtd/spi/spi_flash.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.11.0 _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot