From: Alan Cox Date: Mon, 14 Jan 2008 09:06:40 +0000 (-0800) Subject: libata: correct handling of TSS DVD X-Git-Tag: v2.6.24-rc8~2^2 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=121a09e590d54be840289c6feac840453aa999d9;p=linux-2.6-omap-h63xx.git 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 Cc: Tejun Heo Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik --- diff --git a/include/linux/ata.h b/include/linux/ata.h index 72ab80801ef..e672e80202a 100644 --- 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;