From 13194377cb13de7cd5eede3145fa0364e02a9df1 Mon Sep 17 00:00:00 2001 From: Bartlomiej Zolnierkiewicz Date: Fri, 27 Mar 2009 12:46:37 +0100 Subject: [PATCH] --- yaml --- r: 137661 b: refs/heads/master c: b109f526cabcd098131e770fd6232282bce147b4 h: refs/heads/master i: 137659: 5b3c9a47cd4374273d525cb2ce8f3af9140b2f7b v: v3 --- [refs] | 2 +- trunk/drivers/ide/ide-taskfile.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index fb22069aea0c..a60601bd3ab9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 03a2faaea8f44edfe583ddf1240948019becfbe4 +refs/heads/master: b109f526cabcd098131e770fd6232282bce147b4 diff --git a/trunk/drivers/ide/ide-taskfile.c b/trunk/drivers/ide/ide-taskfile.c index f85b7f21a617..15bbfc1dcd28 100644 --- a/trunk/drivers/ide/ide-taskfile.c +++ b/trunk/drivers/ide/ide-taskfile.c @@ -268,7 +268,7 @@ static void ide_pio_datablock(ide_drive_t *drive, struct request *rq, ide_task_t *task = &drive->hwif->task; u8 saved_io_32bit = drive->io_32bit; - if (rq->bio) /* fs request */ + if (blk_fs_request(rq)) rq->errors = 0; if (task->tf_flags & IDE_TFLAG_IO_16BIT) @@ -292,7 +292,7 @@ static void ide_pio_datablock(ide_drive_t *drive, struct request *rq, static ide_startstop_t task_error(ide_drive_t *drive, struct request *rq, const char *s, u8 stat) { - if (rq->bio) { + if (blk_fs_request(rq)) { ide_hwif_t *hwif = drive->hwif; ide_task_t *task = &hwif->task; int sectors = hwif->nsect - hwif->nleft; @@ -323,7 +323,7 @@ static ide_startstop_t task_error(ide_drive_t *drive, struct request *rq, void task_end_request(ide_drive_t *drive, struct request *rq, u8 stat) { - if (rq->cmd_type == REQ_TYPE_ATA_TASKFILE) { + if (blk_fs_request(rq) == 0) { ide_task_t *task = rq->special; u8 err = ide_read_error(drive);