From: Jeff Garzik <jgarzik@pobox.com>
Date: Thu, 6 Oct 2005 13:40:20 +0000 (-0400)
Subject: [libata passthru] add (DRIVER_SENSE << 24) to all check-conditions
X-Git-Tag: v2.6.15-rc1~732^2~11
X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=0e5dec478cfff2c29e68d1108ff828fa321adc59;p=~andy%2Flinux

[libata passthru] add (DRIVER_SENSE << 24) to all check-conditions
---

diff --git a/drivers/scsi/libata-scsi.c b/drivers/scsi/libata-scsi.c
index 75cb685e320..1b00bc618e1 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)
 
 	memset(sb, 0, SCSI_SENSE_BUFFERSIZE);
 
-	cmd->result = SAM_STAT_CHECK_CONDITION;
+	cmd->result = (DRIVER_SENSE << 24) | SAM_STAT_CHECK_CONDITION;
 
 	/*
 	 * Read the controller registers.
@@ -575,7 +575,7 @@ void ata_gen_fixed_sense(struct ata_queued_cmd *qc)
 
 	memset(sb, 0, SCSI_SENSE_BUFFERSIZE);
 
-	cmd->result = SAM_STAT_CHECK_CONDITION;
+	cmd->result = (DRIVER_SENSE << 24) | SAM_STAT_CHECK_CONDITION;
 
 	/*
 	 * Read the controller registers.
@@ -1638,7 +1638,7 @@ unsigned int ata_scsiop_report_luns(struct ata_scsi_args *args, u8 *rbuf,
 void ata_scsi_badcmd(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *), u8 asc, u8 ascq)
 {
 	DPRINTK("ENTER\n");
-	cmd->result = SAM_STAT_CHECK_CONDITION;
+	cmd->result = (DRIVER_SENSE << 24) | SAM_STAT_CHECK_CONDITION;
 
 	cmd->sense_buffer[0] = 0x70;
 	cmd->sense_buffer[2] = ILLEGAL_REQUEST;