summaryrefslogtreecommitdiffstats
path: root/drivers/mtd/devices
diff options
context:
space:
mode:
authorLee Jones <lee.jones@linaro.org>2014-03-20 11:11:46 +0000
committerBrian Norris <computersforpeace@gmail.com>2014-03-20 04:56:52 -0700
commitea7864bf44e1638c34b9eef95477a72ae68fbdc6 (patch)
treea9a857194ecef19933259c22f546162770b22e6b /drivers/mtd/devices
parentf1919cb852c8f9e7fa667a446f253258a8a599f2 (diff)
downloadlinux-ea7864bf44e1638c34b9eef95477a72ae68fbdc6.tar.bz2
mtd: st_spi_fsm: Allow loop to run at least once before giving up CPU
Reported-by: Brian Norris <computersforpeace@gmail.com> Signed-off-by: Lee Jones <lee.jones@linaro.org> Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Diffstat (limited to 'drivers/mtd/devices')
-rw-r--r--drivers/mtd/devices/st_spi_fsm.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mtd/devices/st_spi_fsm.c b/drivers/mtd/devices/st_spi_fsm.c
index ef9f9b84dbfb..4d6b58c976c7 100644
--- a/drivers/mtd/devices/st_spi_fsm.c
+++ b/drivers/mtd/devices/st_spi_fsm.c
@@ -861,8 +861,6 @@ static uint8_t stfsm_wait_busy(struct stfsm *fsm)
*/
deadline = jiffies + FLASH_MAX_BUSY_WAIT;
while (!timeout) {
- cond_resched();
-
if (time_after_eq(jiffies, deadline))
timeout = 1;
@@ -881,6 +879,8 @@ static uint8_t stfsm_wait_busy(struct stfsm *fsm)
if (!timeout)
/* Restart */
writel(seq->seq_cfg, fsm->base + SPI_FAST_SEQ_CFG);
+
+ cond_resched();
}
dev_err(fsm->dev, "timeout on wait_busy\n");