---

yaml --- r: 72751 b: refs/heads/master c: ab6fc95 h: refs/heads/master i: 72749: f098cd9 72747: b30e200 72743: 35b8e8d 72735: 54341e7 v: v3
git-mirror · Oct 29, 2007 · c8ef8fb · c8ef8fb
1 parent 3accdad
commit c8ef8fb
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git 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
@@ -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) {