libata: correct handling of TSS DVD

Devices that misreport the validity bit for word 93 look like SATA.  If
they are on the blacklist then we must not test for SATA but assume 40 wire
in the 40 wire case (The TSSCorp reports 80 wire on SATA it seems!)

Signed-off-by: Alan Cox <[email protected]>
Cc: Tejun Heo <[email protected]>
Cc: Jeff Garzik <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Jeff Garzik <[email protected]>

diff --git a/include/linux/ata.h b/include/linux/ata.h
index 72ab80801ef61d3f82c3a3cb7e980a2ca6c0f275..e672e80202a8f451c6ccd6b13808d926b4765dc0 100644 (file)
--- a/include/linux/ata.h
+++ b/include/linux/ata.h
@@ -554,8 +554,6 @@ static inline int ata_drive_40wire(const u16 *dev_id)
 
 static inline int ata_drive_40wire_relaxed(const u16 *dev_id)
 {
-       if (ata_id_is_sata(dev_id))
-               return 0;       /* SATA */
        if ((dev_id[93] & 0x2000) == 0x2000)
                return 0;       /* 80 wire */
        return 1;