aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide/ide-lib.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/ide/ide-lib.c')
-rw-r--r--drivers/ide/ide-lib.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/ide/ide-lib.c b/drivers/ide/ide-lib.c
index 9f6e33d8a8b2..09526a0de734 100644
--- a/drivers/ide/ide-lib.c
+++ b/drivers/ide/ide-lib.c
@@ -273,7 +273,7 @@ int ide_set_xfer_rate(ide_drive_t *drive, u8 rate)
273 273
274static void ide_dump_opcode(ide_drive_t *drive) 274static void ide_dump_opcode(ide_drive_t *drive)
275{ 275{
276 struct request *rq = drive->hwif->hwgroup->rq; 276 struct request *rq = drive->hwif->rq;
277 ide_task_t *task = NULL; 277 ide_task_t *task = NULL;
278 278
279 if (!rq) 279 if (!rq)
@@ -346,10 +346,13 @@ static void ide_dump_ata_error(ide_drive_t *drive, u8 err)
346 printk(KERN_CONT "}"); 346 printk(KERN_CONT "}");
347 if ((err & (ATA_BBK | ATA_ABORTED)) == ATA_BBK || 347 if ((err & (ATA_BBK | ATA_ABORTED)) == ATA_BBK ||
348 (err & (ATA_UNC | ATA_IDNF | ATA_AMNF))) { 348 (err & (ATA_UNC | ATA_IDNF | ATA_AMNF))) {
349 struct request *rq = drive->hwif->rq;
350
349 ide_dump_sector(drive); 351 ide_dump_sector(drive);
350 if (HWGROUP(drive) && HWGROUP(drive)->rq) 352
353 if (rq)
351 printk(KERN_CONT ", sector=%llu", 354 printk(KERN_CONT ", sector=%llu",
352 (unsigned long long)HWGROUP(drive)->rq->sector); 355 (unsigned long long)rq->sector);
353 } 356 }
354 printk(KERN_CONT "\n"); 357 printk(KERN_CONT "\n");
355} 358}