From f09e3f2c571fb6d7eb71b3d4388ee3f3bb032e32 Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Mon, 27 Mar 2006 18:46:37 +0100 Subject: [PATCH] --- yaml --- r: 24793 b: refs/heads/master c: e35a9e01f2a504871e70576a9e11dbe4d8dee456 h: refs/heads/master i: 24791: f93c0cecbc535b0c3a204904223fee20fc39a887 v: v3 --- [refs] | 2 +- trunk/drivers/scsi/libata-core.c | 6 +++++- trunk/include/linux/libata.h | 1 + 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index c23d1484739d..4acea7707d41 100644 --- 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 index 86310562da8b..10933cb722e6 100644 --- 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 index a5c213ce97c9..6a9316cbb70b 100644 --- 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);