forked from Minki/linux
[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>
This commit is contained in:
parent
862cff6378
commit
4332a771f4
|
@ -4043,8 +4043,8 @@ fsm_start:
|
||||||
}
|
}
|
||||||
|
|
||||||
/* no more data to transfer */
|
/* no more data to transfer */
|
||||||
DPRINTK("ata%u: command complete, drv_stat 0x%x\n",
|
DPRINTK("ata%u: dev %u command complete, drv_stat 0x%x\n",
|
||||||
ap->id, status);
|
ap->id, qc->dev->devno, status);
|
||||||
|
|
||||||
WARN_ON(qc->err_mask);
|
WARN_ON(qc->err_mask);
|
||||||
|
|
||||||
|
@ -4061,8 +4061,8 @@ fsm_start:
|
||||||
|
|
||||||
case HSM_ST_ERR:
|
case HSM_ST_ERR:
|
||||||
if (qc->tf.command != ATA_CMD_PACKET)
|
if (qc->tf.command != ATA_CMD_PACKET)
|
||||||
printk(KERN_ERR "ata%u: command error, drv_stat 0x%x\n",
|
printk(KERN_ERR "ata%u: dev %u command error, drv_stat 0x%x\n",
|
||||||
ap->id, status);
|
ap->id, qc->dev->devno, status);
|
||||||
|
|
||||||
/* make sure qc->err_mask is available to
|
/* make sure qc->err_mask is available to
|
||||||
* know what's wrong and recover
|
* know what's wrong and recover
|
||||||
|
|
|
@ -137,7 +137,6 @@ int ata_scsi_error(struct Scsi_Host *host)
|
||||||
* LOCKING:
|
* LOCKING:
|
||||||
* Inherited from SCSI layer (none, can sleep)
|
* Inherited from SCSI layer (none, can sleep)
|
||||||
*/
|
*/
|
||||||
|
|
||||||
static void ata_qc_timeout(struct ata_queued_cmd *qc)
|
static void ata_qc_timeout(struct ata_queued_cmd *qc)
|
||||||
{
|
{
|
||||||
struct ata_port *ap = qc->ap;
|
struct ata_port *ap = qc->ap;
|
||||||
|
@ -172,8 +171,6 @@ static void ata_qc_timeout(struct ata_queued_cmd *qc)
|
||||||
printk(KERN_ERR "ata%u: command 0x%x timeout, stat 0x%x host_stat 0x%x\n",
|
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->id, qc->tf.command, drv_stat, host_stat);
|
||||||
|
|
||||||
ap->hsm_task_state = HSM_ST_IDLE;
|
|
||||||
|
|
||||||
/* complete taskfile transaction */
|
/* complete taskfile transaction */
|
||||||
qc->err_mask |= AC_ERR_TIMEOUT;
|
qc->err_mask |= AC_ERR_TIMEOUT;
|
||||||
break;
|
break;
|
||||||
|
|
Loading…
Reference in New Issue
Block a user