---

yaml --- r: 24793 b: refs/heads/master c: e35a9e0 h: refs/heads/master i: 24791: f93c0ce v: v3
git-mirror · Mar 30, 2006 · f09e3f2 · f09e3f2
1 parent 270eb76
commit f09e3f2
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4e5ec5dba22ea509b1a004f9815751f0ffc815e5
+refs/heads/master: e35a9e01f2a504871e70576a9e11dbe4d8dee456
diff --git a/trunk/drivers/scsi/libata-core.c b/trunk/drivers/scsi/libata-core.c
@@ -1409,7 +1409,11 @@ static int ata_bus_probe(struct ata_port *ap)
 	if (!found)
 		goto err_out_disable;
 
-	ata_set_mode(ap);
+	if (ap->ops->set_mode)
+		ap->ops->set_mode(ap);
+	else
+		ata_set_mode(ap);
+
 	if (ap->flags & ATA_FLAG_PORT_DISABLED)
 		goto err_out_disable;
 

diff --git a/trunk/include/linux/libata.h b/trunk/include/linux/libata.h
@@ -433,6 +433,7 @@ struct ata_port_operations {
 	void (*dev_select)(struct ata_port *ap, unsigned int device);
 
 	void (*phy_reset) (struct ata_port *ap); /* obsolete */
+	void (*set_mode) (struct ata_port *ap);
 	int (*probe_reset) (struct ata_port *ap, unsigned int *classes);
 
 	void (*post_set_mode) (struct ata_port *ap);