diff options
| author | Dmitry Adamushko | 2008-04-09 02:41:59 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2008-04-09 03:25:53 +0200 |
| commit | f8e30e447c692aaa728c65930ebc0146f65e1e7b (patch) | |
| tree | 32f6ac1293266be63ae6125868d08f7c39668177 /drivers/mtd | |
| parent | spi: spi_bfin5xx: remove unused label (diff) | |
| download | kernel-qcow2-linux-f8e30e447c692aaa728c65930ebc0146f65e1e7b.tar.gz kernel-qcow2-linux-f8e30e447c692aaa728c65930ebc0146f65e1e7b.tar.xz kernel-qcow2-linux-f8e30e447c692aaa728c65930ebc0146f65e1e7b.zip | |
mtd/chips: add missing set_current_state() to cfi_{amdstd,staa}_sync()
cfi_amdstd_sync() and cfi_staa_sync() call schedule() without changing task's
state appropriately.
In case of e.g. chip->state == FL_ERASING, cfi_*_sync() will be busy-looping
either redundantly for a fixed interval of time (for SCHED_NORMAL tasks) or
possibly endlessly (for RT tasks and UP).
Signed-off-by: Dmitry Adamushko <dmitry.adamushko@gmail.com>
Cc: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/mtd')
| -rw-r--r-- | drivers/mtd/chips/cfi_cmdset_0002.c | 1 | ||||
| -rw-r--r-- | drivers/mtd/chips/cfi_cmdset_0020.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/drivers/mtd/chips/cfi_cmdset_0002.c b/drivers/mtd/chips/cfi_cmdset_0002.c index d072e87ce4e2..458d477614d6 100644 --- a/drivers/mtd/chips/cfi_cmdset_0002.c +++ b/drivers/mtd/chips/cfi_cmdset_0002.c @@ -1763,6 +1763,7 @@ static void cfi_amdstd_sync (struct mtd_info *mtd) default: /* Not an idle state */ + set_current_state(TASK_UNINTERRUPTIBLE); add_wait_queue(&chip->wq, &wait); spin_unlock(chip->mutex); diff --git a/drivers/mtd/chips/cfi_cmdset_0020.c b/drivers/mtd/chips/cfi_cmdset_0020.c index b344ff858b2d..492e2ab27420 100644 --- a/drivers/mtd/chips/cfi_cmdset_0020.c +++ b/drivers/mtd/chips/cfi_cmdset_0020.c @@ -1015,6 +1015,7 @@ static void cfi_staa_sync (struct mtd_info *mtd) default: /* Not an idle state */ + set_current_state(TASK_UNINTERRUPTIBLE); add_wait_queue(&chip->wq, &wait); spin_unlock_bh(chip->mutex); |