---

yaml --- r: 68052 b: refs/heads/master c: 936fd73 h: refs/heads/master v: v3
git-mirror · Oct 12, 2007 · 8b6d770 · 8b6d770
1 parent 631044d
commit 8b6d770
Show file tree

Hide file tree

Showing 12 changed files with 178 additions and 162 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f58229f8060055b08b34008ea08f31de1e2f003c
+refs/heads/master: 936fd7328657884d5a69a55666c74a55aa83ca27
diff --git a/trunk/drivers/ata/ahci.c b/trunk/drivers/ata/ahci.c
@@ -1052,7 +1052,7 @@ static int ahci_do_softreset(struct ata_port *ap, unsigned int *class,
 
 	DPRINTK("ENTER\n");
 
-	if (ata_port_offline(ap)) {
+	if (ata_link_offline(&ap->link)) {
 		DPRINTK("PHY reports no device\n");
 		*class = ATA_DEV_NONE;
 		return 0;
@@ -1140,7 +1140,7 @@ static int ahci_hardreset(struct ata_port *ap, unsigned int *class,
 
 	ahci_start_engine(ap);
 
-	if (rc == 0 && ata_port_online(ap))
+	if (rc == 0 && ata_link_online(&ap->link))
 		*class = ahci_dev_classify(ap);
 	if (*class == ATA_DEV_UNKNOWN)
 		*class = ATA_DEV_NONE;