aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2005-08-07 14:23:42 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2005-08-07 14:23:42 +0100
commit71abe99980e6d7ff8aee8acc7da817b3ad7d8a89 (patch)
tree73c492d859266b54a556ec92471c76d035c926e9
parentfc1df37e3b195cb73ecb14c30d41b7aace3f844a (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>
-rw-r--r--drivers/acorn/block/fd1772.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/acorn/block/fd1772.c b/drivers/acorn/block/fd1772.c
index 3cd2e968e96..c0a37d98b4f 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)
if (fdc_busy) return;
save_flags(flags);
cli();
- while (fdc_busy)
- sleep_on(&fdc_wait);
+ wait_event(fdc_wait, !fdc_busy);
fdc_busy = 1;
ENABLE_IRQ();
restore_flags(flags);