---

yaml --- r: 156660 b: refs/heads/master c: b6931c1 h: refs/heads/master v: v3
git-mirror · Aug 12, 2009 · 1ddcb9b · 1ddcb9b
1 parent 434c451
commit 1ddcb9b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 20308871588518b5e209c403de2a3ad9a2eba9af
+refs/heads/master: b6931c1fbaf7fda9ea7f120228a96600d7090049
diff --git a/trunk/drivers/ata/ahci.c b/trunk/drivers/ata/ahci.c
@@ -1773,7 +1773,8 @@ static int ahci_sb600_softreset(struct ata_link *link, unsigned int *class,
 		irq_sts = readl(port_mmio + PORT_IRQ_STAT);
 		if (irq_sts & PORT_IRQ_BAD_PMP) {
 			ata_link_printk(link, KERN_WARNING,
-					"failed due to HW bug, retry pmp=0\n");
+					"applying SB600 PMP SRST workaround "
+					"and retrying\n");
 			rc = ahci_do_softreset(link, class, 0, deadline,
 					       ahci_check_ready);
 		}