[2/5] cmd: sf Drop reassignment of new into flash

Message ID 20200514121145.28737-3-jagan@amarulasolutions.com
State New
Headers show
Series
  • sf: Cleanup
Related show

Commit Message

Jagan Teki May 14, 2020, 12:11 p.m. UTC
The new pointer points to flash found and that would
assign it to global 'flash' pointer for further flash
operations and also keep track of old flash pointer.

This would happen if the probe is successful or even
failed, but current code assigning new into flash before
and after checking the new.

So, drop the assignment after new checks so flash always
latest new pointer even if probe failed or succeed.

Cc: Simon Glass <sjg@chromium.org>
Cc: Vignesh R <vigneshr@ti.com>
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
---
 cmd/sf.c | 3 ---
 1 file changed, 3 deletions(-)

Comments

Jagan Teki May 19, 2020, 7:25 p.m. UTC | #1
On Thu, May 14, 2020 at 5:42 PM Jagan Teki <jagan@amarulasolutions.com> wrote:
>
> The new pointer points to flash found and that would
> assign it to global 'flash' pointer for further flash
> operations and also keep track of old flash pointer.
>
> This would happen if the probe is successful or even
> failed, but current code assigning new into flash before
> and after checking the new.
>
> So, drop the assignment after new checks so flash always
> latest new pointer even if probe failed or succeed.
>
> Cc: Simon Glass <sjg@chromium.org>
> Cc: Vignesh R <vigneshr@ti.com>
> Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
> ---

Applied to u-boot-spi/master

Patch

diff --git a/cmd/sf.c b/cmd/sf.c
index e993b3e5ad..302201c2b0 100644
--- a/cmd/sf.c
+++ b/cmd/sf.c
@@ -141,13 +141,10 @@  static int do_spi_flash_probe(int argc, char * const argv[])
 
 	new = spi_flash_probe(bus, cs, speed, mode);
 	flash = new;
-
 	if (!new) {
 		printf("Failed to initialize SPI flash at %u:%u\n", bus, cs);
 		return 1;
 	}
-
-	flash = new;
 #endif
 
 	return 0;