From: Christoph Hellwig Date: Sun, 7 Aug 2005 13:23:42 +0000 (+0100) Subject: [PATCH] ARM: switch fd1772.c from sleep_on to wait_event X-Git-Tag: v2.6.13-rc7~131^2 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=71abe99980e6d7ff8aee8acc7da817b3ad7d8a89;p=linux-2.6-omap-h63xx.git [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 Signed-off-by: Russell King --- 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);