From 8b4bf0eb6430ea41bd10471b716ea3398535c066 Mon Sep 17 00:00:00 2001
From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Date: Thu, 13 Oct 2011 15:28:30 +0200
Subject: [PATCH] --- yaml --- r: 269359 b: refs/heads/master c:
 ce986690d9bfabb8c61fd8fe785fce5d95210b66 h: refs/heads/master i:   269357:
 c6f65620542ece4d819913514e6f37420be87772   269355:
 6dc03ab48f2f21d35fe30c20e4fa249ca82e8207   269351:
 f6f0fd64ecd9f64eb5b610906803cac1464eaccd   269343:
 57c7c1c4550f9dd616395a2a130b5982099cc4d1 v: v3

---
 [refs]                       | 2 +-
 trunk/drivers/ata/ata_piix.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index a241a61831b2..60f6a0358913 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 418fae2751b0d1a362ad9e0b45d446dc92e9157f
+refs/heads/master: ce986690d9bfabb8c61fd8fe785fce5d95210b66
diff --git a/trunk/drivers/ata/ata_piix.c b/trunk/drivers/ata/ata_piix.c
index cc431d6bc97f..75fdd026a997 100644
--- a/trunk/drivers/ata/ata_piix.c
+++ b/trunk/drivers/ata/ata_piix.c
@@ -786,8 +786,6 @@ static void piix_set_piomode(struct ata_port *ap, struct ata_device *adev)
 	if (is_slave) {
 		/* clear TIME1|IE1|PPE1|DTE1 */
 		master_data &= 0xff0f;
-		/* Enable SITRE (separate slave timing register) */
-		master_data |= 0x4000;
 		/* enable PPE1, IE1 and TIME1 as needed */
 		master_data |= (control << 4);
 		pci_read_config_byte(dev, slave_port, &slave_data);
@@ -805,6 +803,9 @@ static void piix_set_piomode(struct ata_port *ap, struct ata_device *adev)
 			(timings[pio][0] << 12) |
 			(timings[pio][1] << 8);
 	}
+
+	/* Enable SITRE (separate slave timing register) */
+	master_data |= 0x4000;
 	pci_write_config_word(dev, master_port, master_data);
 	if (is_slave)
 		pci_write_config_byte(dev, slave_port, slave_data);