UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

[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>
This commit is contained in:
Albert Lee 2005-12-05 15:42:17 +08:00 committed by Jeff Garzik
parent 1c8489840e
commit d8fe452b3e
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/scsi/libata-core.c
View File

@ -4083,13 +4083,17 @@ static void atapi_packet_task(void *_data)
/* sleep-wait for BSY to clear */ /* sleep-wait for BSY to clear */
DPRINTK("busy wait\n"); DPRINTK("busy wait\n");
if (ata_busy_sleep(ap, ATA_TMOUT_CDB_QUICK, ATA_TMOUT_CDB)) if (ata_busy_sleep(ap, ATA_TMOUT_CDB_QUICK, ATA_TMOUT_CDB)) {
goto err_out_status; qc->err_mask |= AC_ERR_ATA_BUS;
goto err_out;
}
/* make sure DRQ is set */ /* make sure DRQ is set */
status = ata_chk_status(ap); status = ata_chk_status(ap);
if ((status & (ATA_BUSY | ATA_DRQ)) != ATA_DRQ) if ((status & (ATA_BUSY | ATA_DRQ)) != ATA_DRQ) {
qc->err_mask |= AC_ERR_ATA_BUS;
goto err_out; goto err_out;
}
/* send SCSI cdb */ /* send SCSI cdb */
DPRINTK("send cdb\n"); DPRINTK("send cdb\n");
@ -4121,10 +4125,7 @@ static void atapi_packet_task(void *_data)
return; return;
err_out_status:
status = ata_chk_status(ap);
err_out: err_out:
qc->err_mask |= __ac_err_mask(status);
ata_poll_qc_complete(qc); ata_poll_qc_complete(qc);
} }