From 80dbd2d4ca9a19c0ca5499e36efd77090842aa87 Mon Sep 17 00:00:00 2001 From: Bartlomiej Zolnierkiewicz Date: Fri, 27 Mar 2009 12:46:27 +0100 Subject: [PATCH] --- yaml --- r: 137638 b: refs/heads/master c: c7db966bbbf216b336da921e5d7ba5b9c8467ac1 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/ide/ide-taskfile.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index c4b0cd2fee2a..4e9e06e00b4d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 69197ad70ef6b854988299c1377864f9755cd03d +refs/heads/master: c7db966bbbf216b336da921e5d7ba5b9c8467ac1 diff --git a/trunk/drivers/ide/ide-taskfile.c b/trunk/drivers/ide/ide-taskfile.c index 16138bce84a7..2461245820b7 100644 --- a/trunk/drivers/ide/ide-taskfile.c +++ b/trunk/drivers/ide/ide-taskfile.c @@ -419,12 +419,14 @@ static ide_startstop_t task_out_intr (ide_drive_t *drive) static ide_startstop_t pre_task_out_intr(ide_drive_t *drive, struct request *rq) { + ide_hwif_t *hwif = drive->hwif; ide_startstop_t startstop; if (ide_wait_stat(&startstop, drive, ATA_DRQ, drive->bad_wstat, WAIT_DRQ)) { printk(KERN_ERR "%s: no DRQ after issuing %sWRITE%s\n", - drive->name, drive->hwif->data_phase ? "MULT" : "", + drive->name, + hwif->data_phase == TASKFILE_MULTI_OUT ? "MULT" : "", (drive->dev_flags & IDE_DFLAG_LBA48) ? "_EXT" : ""); return startstop; }