aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorAlbert Lee <albertcc@tw.ibm.com>2005-12-05 02:42:17 -0500
committerJeff Garzik <jgarzik@pobox.com>2005-12-06 04:49:23 -0500
commitd8fe452b3e8e9ea6d62a3d116a092999fabae407 (patch)
tree8fdc1ae032ec0a7e223d33fc92c37fc6e36f4a7c /drivers
parent1c8489840e6b080e810e588423c1b6dd5913cf18 (diff)
[PATCH] libata: determine the err_mask directly in atapi_packet_task()
- set qc->err_mask directly when we found the error - remove the code to determine err_mask from device status Signed-off-by: Albert Lee <albertcc@tw.ibm.com> ============ Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/scsi/libata-core.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/drivers/scsi/libata-core.c b/drivers/scsi/libata-core.c
index cc003f2c6d9b..b3aedb033465 100644
--- a/drivers/scsi/libata-core.c
+++ b/drivers/scsi/libata-core.c
@@ -4083,13 +4083,17 @@ static void atapi_packet_task(void *_data)
4083 4083
4084 /* sleep-wait for BSY to clear */ 4084 /* sleep-wait for BSY to clear */
4085 DPRINTK("busy wait\n"); 4085 DPRINTK("busy wait\n");
4086 if (ata_busy_sleep(ap, ATA_TMOUT_CDB_QUICK, ATA_TMOUT_CDB)) 4086 if (ata_busy_sleep(ap, ATA_TMOUT_CDB_QUICK, ATA_TMOUT_CDB)) {
4087 goto err_out_status; 4087 qc->err_mask |= AC_ERR_ATA_BUS;
4088 goto err_out;
4089 }
4088 4090
4089 /* make sure DRQ is set */ 4091 /* make sure DRQ is set */
4090 status = ata_chk_status(ap); 4092 status = ata_chk_status(ap);
4091 if ((status & (ATA_BUSY | ATA_DRQ)) != ATA_DRQ) 4093 if ((status & (ATA_BUSY | ATA_DRQ)) != ATA_DRQ) {
4094 qc->err_mask |= AC_ERR_ATA_BUS;
4092 goto err_out; 4095 goto err_out;
4096 }
4093 4097
4094 /* send SCSI cdb */ 4098 /* send SCSI cdb */
4095 DPRINTK("send cdb\n"); 4099 DPRINTK("send cdb\n");
@@ -4121,10 +4125,7 @@ static void atapi_packet_task(void *_data)
4121 4125
4122 return; 4126 return;
4123 4127
4124err_out_status:
4125 status = ata_chk_status(ap);
4126err_out: 4128err_out:
4127 qc->err_mask |= __ac_err_mask(status);
4128 ata_poll_qc_complete(qc); 4129 ata_poll_qc_complete(qc);
4129} 4130}
4130 4131