diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-12-01 04:56:43 -0500 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-12-01 04:56:43 -0500 |
| commit | bd3c97a7c718bfb9f1e4f31c16c383a5c6f815eb (patch) | |
| tree | 3f56594e813c6f35cbacbdb3e137ba5bfd0b3069 /drivers/mtd/chips | |
| parent | 6c33cafc794d07c9254c160789120a0e98c088c9 (diff) | |
| parent | 0215ffb08ce99e2bb59eca114a99499a4d06e704 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/mtd/chips')
| -rw-r--r-- | drivers/mtd/chips/cfi_cmdset_0001.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mtd/chips/cfi_cmdset_0001.c b/drivers/mtd/chips/cfi_cmdset_0001.c index 11de54535526..f69184a92eb2 100644 --- a/drivers/mtd/chips/cfi_cmdset_0001.c +++ b/drivers/mtd/chips/cfi_cmdset_0001.c | |||
| @@ -1086,7 +1086,7 @@ static int inval_cache_and_wait_for_operation( | |||
| 1086 | } | 1086 | } |
| 1087 | spin_lock(chip->mutex); | 1087 | spin_lock(chip->mutex); |
| 1088 | 1088 | ||
| 1089 | if (chip->state != chip_state) { | 1089 | while (chip->state != chip_state) { |
| 1090 | /* Someone's suspended the operation: sleep */ | 1090 | /* Someone's suspended the operation: sleep */ |
| 1091 | DECLARE_WAITQUEUE(wait, current); | 1091 | DECLARE_WAITQUEUE(wait, current); |
| 1092 | set_current_state(TASK_UNINTERRUPTIBLE); | 1092 | set_current_state(TASK_UNINTERRUPTIBLE); |