From: Tejun Heo <htejun@gmail.com>
Date: Mon, 5 Feb 2007 14:21:19 +0000 (+0900)
Subject: libata: fix drive side 80c cable check, take 3
X-Git-Tag: v2.6.21-rc1~176
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=61f216c7196e15e56d97c5a75af01e6684f17fa3;p=linux-2.6-omap-h63xx.git

libata: fix drive side 80c cable check, take 3

The 80c wire bit is bit 13, not 14.  Bit 14 is always 1 if word93 is
implemented.  This increases the chance of incorrect wire detection
especially because host side cable detection is often unreliable and
we sometimes soley depend on drive side cable detection.  Fix the test
and add word93 validity check.

Signed-off-by: Tejun Heo <htejun@gmail.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
---

diff --git a/include/linux/ata.h b/include/linux/ata.h
index 18e401ff7ea..272736e3799 100644
--- a/include/linux/ata.h
+++ b/include/linux/ata.h
@@ -352,7 +352,7 @@ static inline int ata_drive_40wire(const u16 *dev_id)
 {
 	if (ata_id_major_version(dev_id) >= 5 && ata_id_is_sata(dev_id))
 		return 0;	/* SATA */
-	if (dev_id[93] & 0x4000)
+	if ((dev_id[93] & 0xE000) == 0x6000)
 		return 0;	/* 80 wire */
 	return 1;
 }