diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2008-04-22 07:34:25 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2008-04-22 07:34:25 -0400 |
| commit | f838bad1b3be8ca0c785ee0e0c570dfda74cf377 (patch) | |
| tree | 5a842a8056a708cfad55a20fa8ab733dd94b0903 /drivers/mtd/chips/cfi_cmdset_0002.c | |
| parent | dd919660aacdf4adfcd279556aa03e595f7f0fc2 (diff) | |
| parent | 807501475fce0ebe68baedf87f202c3e4ee0d12c (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/mtd/chips/cfi_cmdset_0002.c')
| -rw-r--r-- | drivers/mtd/chips/cfi_cmdset_0002.c | 1 |
1 files changed, 1 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) | |||
| 1763 | 1763 | ||
| 1764 | default: | 1764 | default: |
| 1765 | /* Not an idle state */ | 1765 | /* Not an idle state */ |
| 1766 | set_current_state(TASK_UNINTERRUPTIBLE); | ||
| 1766 | add_wait_queue(&chip->wq, &wait); | 1767 | add_wait_queue(&chip->wq, &wait); |
| 1767 | 1768 | ||
| 1768 | spin_unlock(chip->mutex); | 1769 | spin_unlock(chip->mutex); |