Message ID | 1302913525-18649-1-git-send-email-vapier@gentoo.org |
---|---|
State | Accepted |
Commit | bd0d19cc5f346ff6504d47497ec799e066168b96 |
Delegated to: | Mike Frysinger |
Headers | show |
Dear Mike Frysinger, In message <1302913525-18649-1-git-send-email-vapier@gentoo.org> you wrote: > From: Patrick Sestier <psestier@mircom.com> > > The status polling can take a while, so make sure we kick the > watchdog after each successful poll. > > Signed-off-by: Patrick Sestier <psestier@mircom.com> > Signed-off-by: Mike Frysinger <vapier@gentoo.org> > --- > drivers/mtd/spi/spi_flash.c | 3 +++ > 1 files changed, 3 insertions(+), 0 deletions(-) Applied, thanks. Best regards, Wolfgang Denk
diff --git a/drivers/mtd/spi/spi_flash.c b/drivers/mtd/spi/spi_flash.c index c75b716..016b586 100644 --- a/drivers/mtd/spi/spi_flash.c +++ b/drivers/mtd/spi/spi_flash.c @@ -11,6 +11,7 @@ #include <malloc.h> #include <spi.h> #include <spi_flash.h> +#include <watchdog.h> #include "spi_flash_internal.h" @@ -105,6 +106,8 @@ int spi_flash_cmd_poll_bit(struct spi_flash *flash, unsigned long timeout, timebase = get_timer(0); do { + WATCHDOG_RESET(); + ret = spi_xfer(spi, 8, NULL, &status, 0); if (ret) return -1;