aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/libata-eh.c
diff options
context:
space:
mode:
authorAlbert Lee <albertcc@tw.ibm.com>2006-04-03 05:43:24 -0400
committerJeff Garzik <jeff@garzik.org>2006-04-04 08:42:25 -0400
commit4332a771f4d2f23a6d3beff3dd5405e79775a211 (patch)
tree4d4dbcb97e1ff0ac89d49ab36ed6c248e348c4ce /drivers/scsi/libata-eh.c
parent862cff63781e3a9de85d8947c82d55f4cc95572b (diff)
[PATCH] libata-dev: irq-pio minor fix
irq-pio minor fix: - remove the redundant hsm_task_state = HSM_ST_IDLE - add devno to printk() as done in upstream Signed-off-by: Albert Lee <albertcc@tw.ibm.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/scsi/libata-eh.c')
-rw-r--r--drivers/scsi/libata-eh.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/scsi/libata-eh.c b/drivers/scsi/libata-eh.c
index 011e083b19e1..9a8eea11b0be 100644
--- a/drivers/scsi/libata-eh.c
+++ b/drivers/scsi/libata-eh.c
@@ -137,7 +137,6 @@ int ata_scsi_error(struct Scsi_Host *host)
137 * LOCKING: 137 * LOCKING:
138 * Inherited from SCSI layer (none, can sleep) 138 * Inherited from SCSI layer (none, can sleep)
139 */ 139 */
140
141static void ata_qc_timeout(struct ata_queued_cmd *qc) 140static void ata_qc_timeout(struct ata_queued_cmd *qc)
142{ 141{
143 struct ata_port *ap = qc->ap; 142 struct ata_port *ap = qc->ap;
@@ -172,8 +171,6 @@ static void ata_qc_timeout(struct ata_queued_cmd *qc)
172 printk(KERN_ERR "ata%u: command 0x%x timeout, stat 0x%x host_stat 0x%x\n", 171 printk(KERN_ERR "ata%u: command 0x%x timeout, stat 0x%x host_stat 0x%x\n",
173 ap->id, qc->tf.command, drv_stat, host_stat); 172 ap->id, qc->tf.command, drv_stat, host_stat);
174 173
175 ap->hsm_task_state = HSM_ST_IDLE;
176
177 /* complete taskfile transaction */ 174 /* complete taskfile transaction */
178 qc->err_mask |= AC_ERR_TIMEOUT; 175 qc->err_mask |= AC_ERR_TIMEOUT;
179 break; 176 break;