diff --git a/[refs] b/[refs]
index 1d498459464d..ad1e10712d8e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 862cff63781e3a9de85d8947c82d55f4cc95572b
+refs/heads/master: 4332a771f4d2f23a6d3beff3dd5405e79775a211
diff --git a/trunk/drivers/scsi/libata-core.c b/trunk/drivers/scsi/libata-core.c
index 56537293ad41..d270b23a03b8 100644
--- a/trunk/drivers/scsi/libata-core.c
+++ b/trunk/drivers/scsi/libata-core.c
@@ -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
diff --git a/trunk/drivers/scsi/libata-eh.c b/trunk/drivers/scsi/libata-eh.c
index 011e083b19e1..9a8eea11b0be 100644
--- a/trunk/drivers/scsi/libata-eh.c
+++ b/trunk/drivers/scsi/libata-eh.c
@@ -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;