summaryrefslogtreecommitdiffstats
path: root/drivers/ata
diff options
context:
space:
mode:
authorTejun Heo <htejun@gmail.com>2007-04-23 02:05:53 +0900
committerJeff Garzik <jeff@garzik.org>2007-04-28 14:46:18 -0400
commitc1c4e8d55757f8aec5f95eb80860e340d717c217 (patch)
tree1ecd67225ea52427f701d56e57ae13f803f69a88 /drivers/ata
parentabcfa88bd47d433c796cf724a8a8b321a7190bdd (diff)
downloadop-kernel-dev-c1c4e8d55757f8aec5f95eb80860e340d717c217.zip
op-kernel-dev-c1c4e8d55757f8aec5f95eb80860e340d717c217.tar.gz
libata: add missing call to ->cable_detect() in new EH path
->cable_detect() used to be called on by the old ata_bus_probe() path. Add invocation to ata_eh_revalidate_and_attach() right after IDENTIFYs are done. Signed-off-by: Tejun Heo <htejun@gmail.com> Cc: Alan Cox <alan@lxorguk.ukuu.org.uk> Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/ata')
-rw-r--r--drivers/ata/libata-eh.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/ata/libata-eh.c b/drivers/ata/libata-eh.c
index 0dbee55..67bf150 100644
--- a/drivers/ata/libata-eh.c
+++ b/drivers/ata/libata-eh.c
@@ -1810,6 +1810,10 @@ static int ata_eh_revalidate_and_attach(struct ata_port *ap,
}
}
+ /* PDIAG- should have been released, ask cable type if post-reset */
+ if ((ehc->i.flags & ATA_EHI_DID_RESET) && ap->ops->cable_detect)
+ ap->cbl = ap->ops->cable_detect(ap);
+
/* Configure new devices forward such that user doesn't see
* device detection messages backwards.
*/
OpenPOWER on IntegriCloud