diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-31 12:28:01 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-31 12:28:01 -0800 |
| commit | d21c356b08820e60501ce7a42107a7f05863d91d (patch) | |
| tree | 2cbb38e7f31dc98d41a66427c7f85e248c232ed9 /drivers/scsi/libata-scsi.c | |
| parent | 108b42b4b966462444265806e3d7260a632ad630 (diff) | |
| parent | be9a50c8524b53003e5fa32f072945772ffd13a5 (diff) | |
| download | blackbird-op-linux-d21c356b08820e60501ce7a42107a7f05863d91d.tar.gz blackbird-op-linux-d21c356b08820e60501ce7a42107a7f05863d91d.zip | |
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
[PATCH] libata: fix ata_xfer_tbl termination
[PATCH] libata: make ata_qc_issue complete failed qcs
[PATCH] libata: fix ata_qc_issue failure path
[PATCH] ata_piix: fix ich6/m_map_db
[libata] ahci: add ATI SB600 PCI IDs
Diffstat (limited to 'drivers/scsi/libata-scsi.c')
| -rw-r--r-- | drivers/scsi/libata-scsi.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/scsi/libata-scsi.c b/drivers/scsi/libata-scsi.c index 628191bfd990..53f5b0d9161c 100644 --- a/drivers/scsi/libata-scsi.c +++ b/drivers/scsi/libata-scsi.c @@ -1431,9 +1431,7 @@ static void ata_scsi_translate(struct ata_port *ap, struct ata_device *dev, goto early_finish; /* select device, send command to hardware */ - qc->err_mask = ata_qc_issue(qc); - if (qc->err_mask) - ata_qc_complete(qc); + ata_qc_issue(qc); VPRINTK("EXIT\n"); return; @@ -2199,9 +2197,7 @@ static void atapi_request_sense(struct ata_queued_cmd *qc) qc->complete_fn = atapi_sense_complete; - qc->err_mask = ata_qc_issue(qc); - if (qc->err_mask) - ata_qc_complete(qc); + ata_qc_issue(qc); DPRINTK("EXIT\n"); } |
