diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-05 18:39:23 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-05 18:39:23 -0400 |
commit | e12669e774be403c84baa651306d305752a35cd8 (patch) | |
tree | d0ce83e8f41f6eb09e1a3771337bb7cd8c4ed0f9 /drivers/scsi/libata-core.c | |
parent | 8a70f8dc08dd40b7f8ac77280eaa99a8c6bc46f4 (diff) | |
download | blackbird-obmc-linux-e12669e774be403c84baa651306d305752a35cd8.tar.gz blackbird-obmc-linux-e12669e774be403c84baa651306d305752a35cd8.zip |
libata: minor cleanups
A few code shuffles, to make merging future code easier.
Add (DRIVER_SENSE << 24) to certain result codes, as noted by Douglas
Gilbert.
Diffstat (limited to 'drivers/scsi/libata-core.c')
-rw-r--r-- | drivers/scsi/libata-core.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/scsi/libata-core.c b/drivers/scsi/libata-core.c index f731bbdd4236..d568914c4344 100644 --- a/drivers/scsi/libata-core.c +++ b/drivers/scsi/libata-core.c @@ -3131,14 +3131,14 @@ void ata_eng_timeout(struct ata_port *ap) DPRINTK("ENTER\n"); qc = ata_qc_from_tag(ap, ap->active_tag); - if (!qc) { + if (qc) + ata_qc_timeout(qc); + else { printk(KERN_ERR "ata%u: BUG: timeout without command\n", ap->id); goto out; } - ata_qc_timeout(qc); - out: DPRINTK("EXIT\n"); } |