From efcb85f6aa57e8670c62f444fd1ec579e6b8f271 Mon Sep 17 00:00:00 2001
From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Date: Fri, 18 Apr 2008 00:46:22 +0200
Subject: [PATCH] --- yaml --- r: 89311 b: refs/heads/master c:
 c7f6f21aaeb826a9b04b5897a92f29226995170f h: refs/heads/master i:   89309:
 b64177ab1ca9a7137c13d9e07e0403e5df719028   89307:
 e473d2a3d9236812a8a3a9492db8a0cec5a01cf0   89303:
 339be3524bfe73a9f02cbcc1ed812c97dde7892f   89295:
 3d963b90b44a88a3e75fbefd77167a051de3f8ce   89279:
 ec46b249990d5607d8f67c9e82940ed0eb4b5a3e v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/ide/ide-probe.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index bf5a0c302495..b39df4b9e6fc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8f22a72bf52e76d6bcd11bf9e695fdde61bd454c
+refs/heads/master: c7f6f21aaeb826a9b04b5897a92f29226995170f
diff --git a/trunk/drivers/ide/ide-probe.c b/trunk/drivers/ide/ide-probe.c
index 47a114927c31..9db8978ad394 100644
--- a/trunk/drivers/ide/ide-probe.c
+++ b/trunk/drivers/ide/ide-probe.c
@@ -1366,7 +1366,10 @@ static void ide_init_port(ide_hwif_t *hwif, unsigned int port,
 	/* call chipset specific routine for each enabled port */
 	if (d->init_hwif)
 		d->init_hwif(hwif);
+}
 
+static void ide_port_cable_detect(ide_hwif_t *hwif)
+{
 	if (hwif->cable_detect && (hwif->ultra_mask & 0x78)) {
 		if (hwif->cbl != ATA_CBL_PATA40_SHORT)
 			hwif->cbl = hwif->cable_detect(hwif);
@@ -1394,6 +1397,7 @@ int ide_device_add_all(u8 *idx, const struct ide_port_info *d)
 		mate = (i & 1) ? NULL : hwif;
 
 		ide_init_port(hwif, i & 1, d);
+		ide_port_cable_detect(hwif);
 		ide_port_init_devices(hwif);
 	}