Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4332a771 authored by Albert Lee's avatar Albert Lee Committed by Jeff Garzik
Browse files

[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: default avatarAlbert Lee <albertcc@tw.ibm.com>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 862cff63

drivers/scsi/libata-core.c

+4 −4
Original line number Diff line number Diff line
@@ -4043,8 +4043,8 @@ static int ata_hsm_move(struct ata_port *ap, struct ata_queued_cmd *qc, 
		}



		/* 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 @@ static int ata_hsm_move(struct ata_port *ap, struct ata_queued_cmd *qc, 


	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

drivers/scsi/libata-eh.c

+0 −3
Original line number Diff line number Diff line
@@ -137,7 +137,6 @@ int ata_scsi_error(struct Scsi_Host *host) 
 *	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_queued_cmd *qc) 
		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;