diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2006-01-27 02:36:14 -0500 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2006-01-27 02:36:14 -0500 |
commit | 7dfb869c8e45e5863534f38fdac990829b22964a (patch) | |
tree | f36bbdba46b022356d05ac26d5073e395d2f8abd /drivers/scsi/libata-scsi.c | |
parent | 628e386e27674906326455f01d87878a5f0cbce7 (diff) | |
parent | 11a56d2439259892319df81cf1582687d7e7fde5 (diff) | |
download | op-kernel-dev-7dfb869c8e45e5863534f38fdac990829b22964a.zip op-kernel-dev-7dfb869c8e45e5863534f38fdac990829b22964a.tar.gz |
Merge branch 'tmp'
Diffstat (limited to 'drivers/scsi/libata-scsi.c')
-rw-r--r-- | drivers/scsi/libata-scsi.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/scsi/libata-scsi.c b/drivers/scsi/libata-scsi.c index ce3fe92..c496309 100644 --- a/drivers/scsi/libata-scsi.c +++ b/drivers/scsi/libata-scsi.c @@ -1322,8 +1322,10 @@ static void ata_scsi_translate(struct ata_port *ap, struct ata_device *dev, goto early_finish; /* select device, send command to hardware */ - if (ata_qc_issue(qc)) - goto err_did; + if (ata_qc_issue(qc)) { + qc->err_mask |= AC_ERR_OTHER; + ata_qc_complete(qc); + } VPRINTK("EXIT\n"); return; |