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@xxxxxxxxxx>
---
--- irq-pio0/drivers/scsi/libata-eh.c 2006-04-03 13:50:15.000000000 +0800
+++ irq-pio1/drivers/scsi/libata-eh.c 2006-04-03 16:28:52.000000000 +0800
@@ -137,7 +137,6 @@ int ata_scsi_error(struct Scsi_Host *hos
* LOCKING:
* Inherited from SCSI layer (none, can sleep)
*/
-
static void ata_qc_timeout(struct ata_queued_cmd *qc)
{
struct ata_port *ap = qc->ap;
@@ -172,8 +171,6 @@ static void ata_qc_timeout(struct ata_qu
printk(KERN_ERR "ata%u: command 0x%x timeout, stat 0x%x host_stat 0x%x\n",
ap->id, qc->tf.command, drv_stat, host_stat);
- ap->hsm_task_state = HSM_ST_IDLE;
-
/* complete taskfile transaction */
qc->err_mask |= AC_ERR_TIMEOUT;
break;
--- irq-pio0/drivers/scsi/libata-core.c 2006-04-03 13:50:15.000000000 +0800
+++ irq-pio1/drivers/scsi/libata-core.c 2006-04-03 15:36:10.000000000 +0800
@@ -4043,8 +4043,8 @@ fsm_start:
}
/* no more data to transfer */
- DPRINTK("ata%u: command complete, drv_stat 0x%x\n",
- ap->id, status);
+ DPRINTK("ata%u: dev %u command complete, drv_stat 0x%x\n",
+ ap->id, qc->dev->devno, status);
WARN_ON(qc->err_mask);
@@ -4061,8 +4061,8 @@ fsm_start:
case HSM_ST_ERR:
if (qc->tf.command != ATA_CMD_PACKET)
- printk(KERN_ERR "ata%u: command error, drv_stat 0x%x\n",
- ap->id, status);
+ printk(KERN_ERR "ata%u: dev %u command error, drv_stat 0x%x\n",
+ ap->id, qc->dev->devno, status);
/* make sure qc->err_mask is available to
* know what's wrong and recover
-
: send the line "unsubscribe linux-ide" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
