aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-10-06 09:40:20 -0400
committerJeff Garzik <jgarzik@pobox.com>2005-10-06 09:40:20 -0400
commit0e5dec478cfff2c29e68d1108ff828fa321adc59 (patch)
tree8daeaf1a20138ecfae874578ee77bb62a9b496fb /drivers/scsi
parent54dac83c426a1a03bd139c5ac7e938890bd2693e (diff)
[libata passthru] add (DRIVER_SENSE << 24) to all check-conditions
Diffstat (limited to 'drivers/scsi')
-rw-r--r--drivers/scsi/libata-scsi.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/scsi/libata-scsi.c b/drivers/scsi/libata-scsi.c
index 75cb685e320b..1b00bc618e15 100644
--- a/drivers/scsi/libata-scsi.c
+++ b/drivers/scsi/libata-scsi.c
@@ -500,7 +500,7 @@ void ata_gen_ata_desc_sense(struct ata_queued_cmd *qc)
500 500
501 memset(sb, 0, SCSI_SENSE_BUFFERSIZE); 501 memset(sb, 0, SCSI_SENSE_BUFFERSIZE);
502 502
503 cmd->result = SAM_STAT_CHECK_CONDITION; 503 cmd->result = (DRIVER_SENSE << 24) | SAM_STAT_CHECK_CONDITION;
504 504
505 /* 505 /*
506 * Read the controller registers. 506 * Read the controller registers.
@@ -575,7 +575,7 @@ void ata_gen_fixed_sense(struct ata_queued_cmd *qc)
575 575
576 memset(sb, 0, SCSI_SENSE_BUFFERSIZE); 576 memset(sb, 0, SCSI_SENSE_BUFFERSIZE);
577 577
578 cmd->result = SAM_STAT_CHECK_CONDITION; 578 cmd->result = (DRIVER_SENSE << 24) | SAM_STAT_CHECK_CONDITION;
579 579
580 /* 580 /*
581 * Read the controller registers. 581 * Read the controller registers.
@@ -1638,7 +1638,7 @@ unsigned int ata_scsiop_report_luns(struct ata_scsi_args *args, u8 *rbuf,
1638void ata_scsi_badcmd(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *), u8 asc, u8 ascq) 1638void ata_scsi_badcmd(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *), u8 asc, u8 ascq)
1639{ 1639{
1640 DPRINTK("ENTER\n"); 1640 DPRINTK("ENTER\n");
1641 cmd->result = SAM_STAT_CHECK_CONDITION; 1641 cmd->result = (DRIVER_SENSE << 24) | SAM_STAT_CHECK_CONDITION;
1642 1642
1643 cmd->sense_buffer[0] = 0x70; 1643 cmd->sense_buffer[0] = 0x70;
1644 cmd->sense_buffer[2] = ILLEGAL_REQUEST; 1644 cmd->sense_buffer[2] = ILLEGAL_REQUEST;