From c8ef8fbf111bf0282fd15e5065357787e1f552af Mon Sep 17 00:00:00 2001
From: Jeff Garzik <jeff@garzik.org>
Date: Mon, 29 Oct 2007 10:43:55 -0400
Subject: [PATCH] --- yaml --- r: 72751 b: refs/heads/master c:
 ab6fc95f609b372a19e18ea689986846ab1ba29c h: refs/heads/master i:   72749:
 f098cd901247e72aae03d778000aaf06cce926d5   72747:
 b30e2004175b6ccf76ed3e0483c88bc92d06f2e2   72743:
 35b8e8d1ba9cca60ad29f1eb8d538767b8e310c4   72735:
 54341e7fb8e997b94730bf42e5583c12f15e0632 v: v3

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

diff --git a/[refs] b/[refs]
index 649fb03e6db1..0ddbe37220eb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 360737a982b1ae09e1659e0bb27085c03f02f404
+refs/heads/master: ab6fc95f609b372a19e18ea689986846ab1ba29c
diff --git a/trunk/drivers/ata/ahci.c b/trunk/drivers/ata/ahci.c
index 93bcb2cb3d35..c8ab947cf359 100644
--- a/trunk/drivers/ata/ahci.c
+++ b/trunk/drivers/ata/ahci.c
@@ -898,8 +898,10 @@ static int ahci_reset_controller(struct ata_host *host)
 	 * AHCI-specific, such as HOST_RESET.
 	 */
 	tmp = readl(mmio + HOST_CTL);
-	if (!(tmp & HOST_AHCI_EN))
-		writel(tmp | HOST_AHCI_EN, mmio + HOST_CTL);
+	if (!(tmp & HOST_AHCI_EN)) {
+		tmp |= HOST_AHCI_EN;
+		writel(tmp, mmio + HOST_CTL);
+	}
 
 	/* global controller reset */
 	if ((tmp & HOST_RESET) == 0) {