From: TsiChung Liew Tsi-Chung.Liew@freescale.com
Add MTD SPI Flash support for M25P16, M25P40, M25P64, and M25P80.
Signed-off-by: Jason McMullan mcmullan@netapp.com Signed-off-by: TsiChung Liew Tsi-Chung.Liew@freescale.com --- drivers/mtd/spi/stmicro.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/mtd/spi/stmicro.c b/drivers/mtd/spi/stmicro.c index 3854cbe..6e5ce7a 100644 --- a/drivers/mtd/spi/stmicro.c +++ b/drivers/mtd/spi/stmicro.c @@ -2,7 +2,7 @@ * (C) Copyright 2000-2002 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. * - * Copyright 2008, Network Appliance Inc. + * Network Appliance Inc. * Jason McMullan mcmullan@netapp.com * * See file CREDITS for list of people who contributed to this @@ -129,7 +129,7 @@ static int stmicro_wait_ready(struct spi_flash *flash, unsigned long timeout) if ((status & STMICRO_SR_WIP) == 0) break;
- } while (1 || get_timer(timebase) < timeout); + } while (get_timer(timebase) < timeout);
spi_xfer(spi, 0, NULL, NULL, SPI_XFER_END);