From: George Kibardin <george-kibardin@yandex.ru>
Date: Thu, 10 Jan 2008 22:03:42 +0000 (+0100)
Subject: ide: fix cable detection for SATA bridges
X-Git-Tag: v2.6.24-rc8~51^2~1
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=b98f8803ccfe9d156d37a6eb471a620904085c80;p=~emulex%2Finfiniband.git

ide: fix cable detection for SATA bridges

Signed-off-by: George Kibardin <george-kibardin@yandex.ru>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
---

diff --git a/drivers/ide/ide-iops.c b/drivers/ide/ide-iops.c
index cef405ddaf0..bb9693dabe4 100644
--- a/drivers/ide/ide-iops.c
+++ b/drivers/ide/ide-iops.c
@@ -612,12 +612,12 @@ u8 eighty_ninty_three (ide_drive_t *drive)
 		printk(KERN_DEBUG "%s: skipping word 93 validity check\n",
 				  drive->name);
 
+	if (ide_dev_is_sata(id) && !ivb)
+		return 1;
+
 	if (hwif->cbl != ATA_CBL_PATA80 && !ivb)
 		goto no_80w;
 
-	if (ide_dev_is_sata(id))
-		return 1;
-
 	/*
 	 * FIXME:
 	 * - force bit13 (80c cable present) check also for !ivb devices