summaryrefslogtreecommitdiffstats
path: root/drivers/acorn/block/fd1772.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/acorn/block/fd1772.c')
-rw-r--r--drivers/acorn/block/fd1772.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/acorn/block/fd1772.c b/drivers/acorn/block/fd1772.c
index 54ed9ac6b..95836eb29 100644
--- a/drivers/acorn/block/fd1772.c
+++ b/drivers/acorn/block/fd1772.c
@@ -591,7 +591,7 @@ static void fd_error(void)
{
printk("FDC1772: fd_error\n");
/*panic("fd1772: fd_error"); *//* DAG tmp */
- if (!CURRENT)
+ if (QUEUE_EMPTY)
return;
CURRENT->errors++;
if (CURRENT->errors >= MAX_ERRORS) {
@@ -1230,14 +1230,14 @@ static void redo_fd_request(void)
DPRINT(("redo_fd_request: CURRENT=%08lx CURRENT->rq_dev=%04x CURRENT->sector=%ld\n",
(unsigned long) CURRENT, CURRENT ? CURRENT->rq_dev : 0,
- CURRENT ? CURRENT->sector : 0));
+ !QUEUE_EMPTY ? CURRENT->sector : 0));
- if (CURRENT && CURRENT->rq_status == RQ_INACTIVE)
+ if (!QUEUE_EMPTY && CURRENT->rq_status == RQ_INACTIVE)
goto the_end;
repeat:
- if (!CURRENT)
+ if (QUEUE_EMPTY)
goto the_end;
if (MAJOR(CURRENT->rq_dev) != MAJOR_NR)