diff options
author | Christoph Hellwig <hch@lst.de> | 2005-08-07 09:23:42 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2005-08-07 09:23:42 -0400 |
commit | 71abe99980e6d7ff8aee8acc7da817b3ad7d8a89 (patch) | |
tree | 73c492d859266b54a556ec92471c76d035c926e9 /drivers/acorn | |
parent | fc1df37e3b195cb73ecb14c30d41b7aace3f844a (diff) |
[PATCH] ARM: switch fd1772.c from sleep_on to wait_event
Doesn't make the local irq disabling around it less buggy, but at
least we replace the offender with the right kind of primitive.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'drivers/acorn')
-rw-r--r-- | drivers/acorn/block/fd1772.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/acorn/block/fd1772.c b/drivers/acorn/block/fd1772.c index 3cd2e968e96c..c0a37d98b4f3 100644 --- a/drivers/acorn/block/fd1772.c +++ b/drivers/acorn/block/fd1772.c | |||
@@ -1283,8 +1283,7 @@ static void do_fd_request(request_queue_t* q) | |||
1283 | if (fdc_busy) return; | 1283 | if (fdc_busy) return; |
1284 | save_flags(flags); | 1284 | save_flags(flags); |
1285 | cli(); | 1285 | cli(); |
1286 | while (fdc_busy) | 1286 | wait_event(fdc_wait, !fdc_busy); |
1287 | sleep_on(&fdc_wait); | ||
1288 | fdc_busy = 1; | 1287 | fdc_busy = 1; |
1289 | ENABLE_IRQ(); | 1288 | ENABLE_IRQ(); |
1290 | restore_flags(flags); | 1289 | restore_flags(flags); |