summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/ide/ide-atapi.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/ide/ide-atapi.c b/drivers/ide/ide-atapi.c
index 14d1e7d9a1d6..0e6bc631a1ca 100644
--- a/drivers/ide/ide-atapi.c
+++ b/drivers/ide/ide-atapi.c
@@ -282,7 +282,7 @@ int ide_cd_expiry(ide_drive_t *drive)
282 struct request *rq = drive->hwif->rq; 282 struct request *rq = drive->hwif->rq;
283 unsigned long wait = 0; 283 unsigned long wait = 0;
284 284
285 debug_log("%s: rq->cmd[0]: 0x%x\n", __func__, rq->cmd[0]); 285 debug_log("%s: scsi_req(rq)->cmd[0]: 0x%x\n", __func__, scsi_req(rq)->cmd[0]);
286 286
287 /* 287 /*
288 * Some commands are *slow* and normally take a long time to complete. 288 * Some commands are *slow* and normally take a long time to complete.
@@ -463,7 +463,7 @@ static ide_startstop_t ide_pc_intr(ide_drive_t *drive)
463 return ide_do_reset(drive); 463 return ide_do_reset(drive);
464 } 464 }
465 465
466 debug_log("[cmd %x]: check condition\n", rq->cmd[0]); 466 debug_log("[cmd %x]: check condition\n", scsi_req(rq)->cmd[0]);
467 467
468 /* Retry operation */ 468 /* Retry operation */
469 ide_retry_pc(drive); 469 ide_retry_pc(drive);
@@ -531,7 +531,7 @@ static ide_startstop_t ide_pc_intr(ide_drive_t *drive)
531 ide_pad_transfer(drive, write, bcount); 531 ide_pad_transfer(drive, write, bcount);
532 532
533 debug_log("[cmd %x] transferred %d bytes, padded %d bytes, resid: %u\n", 533 debug_log("[cmd %x] transferred %d bytes, padded %d bytes, resid: %u\n",
534 rq->cmd[0], done, bcount, scsi_req(rq)->resid_len); 534 scsi_req(rq)->cmd[0], done, bcount, scsi_req(rq)->resid_len);
535 535
536 /* And set the interrupt handler again */ 536 /* And set the interrupt handler again */
537 ide_set_handler(drive, ide_pc_intr, timeout); 537 ide_set_handler(drive, ide_pc_intr, timeout);