aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ata/libata-scsi.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/ata/libata-scsi.c')
-rw-r--r--drivers/ata/libata-scsi.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
index 48e388800f5a..00a9a6c8f83c 100644
--- a/drivers/ata/libata-scsi.c
+++ b/drivers/ata/libata-scsi.c
@@ -782,7 +782,7 @@ static void ata_gen_passthru_sense(struct ata_queued_cmd *qc)
782 */ 782 */
783 if (qc->err_mask || 783 if (qc->err_mask ||
784 tf->command & (ATA_BUSY | ATA_DF | ATA_ERR | ATA_DRQ)) { 784 tf->command & (ATA_BUSY | ATA_DF | ATA_ERR | ATA_DRQ)) {
785 ata_to_sense_error(qc->ap->id, tf->command, tf->feature, 785 ata_to_sense_error(qc->ap->print_id, tf->command, tf->feature,
786 &sb[1], &sb[2], &sb[3], verbose); 786 &sb[1], &sb[2], &sb[3], verbose);
787 sb[1] &= 0x0f; 787 sb[1] &= 0x0f;
788 } 788 }
@@ -855,7 +855,7 @@ static void ata_gen_ata_sense(struct ata_queued_cmd *qc)
855 */ 855 */
856 if (qc->err_mask || 856 if (qc->err_mask ||
857 tf->command & (ATA_BUSY | ATA_DF | ATA_ERR | ATA_DRQ)) { 857 tf->command & (ATA_BUSY | ATA_DF | ATA_ERR | ATA_DRQ)) {
858 ata_to_sense_error(qc->ap->id, tf->command, tf->feature, 858 ata_to_sense_error(qc->ap->print_id, tf->command, tf->feature,
859 &sb[1], &sb[2], &sb[3], verbose); 859 &sb[1], &sb[2], &sb[3], verbose);
860 sb[1] &= 0x0f; 860 sb[1] &= 0x0f;
861 } 861 }
@@ -1473,7 +1473,7 @@ static void ata_scsi_qc_complete(struct ata_queued_cmd *qc)
1473 } 1473 }
1474 1474
1475 if (need_sense && !ap->ops->error_handler) 1475 if (need_sense && !ap->ops->error_handler)
1476 ata_dump_status(ap->id, &qc->result_tf); 1476 ata_dump_status(ap->print_id, &qc->result_tf);
1477 1477
1478 qc->scsidone(cmd); 1478 qc->scsidone(cmd);
1479 1479
@@ -2776,7 +2776,7 @@ static inline void ata_scsi_dump_cdb(struct ata_port *ap,
2776 u8 *scsicmd = cmd->cmnd; 2776 u8 *scsicmd = cmd->cmnd;
2777 2777
2778 DPRINTK("CDB (%u:%d,%d,%d) %02x %02x %02x %02x %02x %02x %02x %02x %02x\n", 2778 DPRINTK("CDB (%u:%d,%d,%d) %02x %02x %02x %02x %02x %02x %02x %02x %02x\n",
2779 ap->id, 2779 ap->print_id,
2780 scsidev->channel, scsidev->id, scsidev->lun, 2780 scsidev->channel, scsidev->id, scsidev->lun,
2781 scsicmd[0], scsicmd[1], scsicmd[2], scsicmd[3], 2781 scsicmd[0], scsicmd[1], scsicmd[2], scsicmd[3],
2782 scsicmd[4], scsicmd[5], scsicmd[6], scsicmd[7], 2782 scsicmd[4], scsicmd[5], scsicmd[6], scsicmd[7],