diff --git a/[refs] b/[refs]
index 43ceae2704fc..84a1669ef942 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ef2824073fba9def3cf122e89cc485f66dd71f70
+refs/heads/master: 20952b699035448d2277c64efc5910a31be66ed1
diff --git a/trunk/drivers/scsi/libata-eh.c b/trunk/drivers/scsi/libata-eh.c
index 71b45ad2c124..b88f492eab12 100644
--- a/trunk/drivers/scsi/libata-eh.c
+++ b/trunk/drivers/scsi/libata-eh.c
@@ -1287,7 +1287,7 @@ static int ata_eh_reset(struct ata_port *ap, ata_reset_fn_t softreset,
 	unsigned int classes[ATA_MAX_DEVICES];
 	int tries = ATA_EH_RESET_TRIES;
 	ata_reset_fn_t reset;
-	int rc;
+	int i, rc;
 
 	if (softreset && (!hardreset || (!sata_set_spd_needed(ap) &&
 					 !(ehc->i.action & ATA_EH_HARDRESET))))
@@ -1319,6 +1319,12 @@ static int ata_eh_reset(struct ata_port *ap, ata_reset_fn_t softreset,
 	}
 
 	if (rc == 0) {
+		/* After the reset, the device state is PIO 0 and the
+		 * controller state is undefined.  Record the mode.
+		 */
+		for (i = 0; i < ATA_MAX_DEVICES; i++)
+			ap->device[i].pio_mode = XFER_PIO_0;
+
 		if (postreset)
 			postreset(ap, classes);