From: Greg Kroah-Hartman Date: Wed, 7 Mar 2007 00:56:07 +0000 (-0800) Subject: remove libata-fix-drive-side-80c-cable-check.patch at Alan Cox's recommendation X-Git-Tag: v2.6.20.2~18 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=da26bfe3418816c744be7a9c57593ebab4ac9585;p=thirdparty%2Fkernel%2Fstable-queue.git remove libata-fix-drive-side-80c-cable-check.patch at Alan Cox's recommendation --- diff --git a/queue-2.6.20/libata-fix-drive-side-80c-cable-check.patch b/queue-2.6.20/libata-fix-drive-side-80c-cable-check.patch deleted file mode 100644 index 386ec36a36f..00000000000 --- a/queue-2.6.20/libata-fix-drive-side-80c-cable-check.patch +++ /dev/null @@ -1,38 +0,0 @@ -From stable-bounces@linux.kernel.org Mon Feb 5 06:22:51 2007 -From: Tejun Heo -Date: Mon, 5 Feb 2007 23:21:19 +0900 -Subject: libata: fix drive side 80c cable check -To: Alan -Cc: linux-ide@vger.kernel.org, stable@kernel.org, Jeff Garzik -Message-ID: <20070205142119.GM1625@htj.dyndns.org> -Content-Disposition: inline - - -From: Tejun Heo - -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 -Acked-by: Alan Cox -Cc: Jeff Garzik -Signed-off-by: Greg Kroah-Hartman - ---- - include/linux/ata.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- linux-2.6.20.1.orig/include/linux/ata.h -+++ linux-2.6.20.1/include/linux/ata.h -@@ -347,7 +347,7 @@ static inline int ata_drive_40wire(const - { - 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; - } diff --git a/queue-2.6.20/series b/queue-2.6.20/series index 8b02dc75e83..c0fef20a230 100644 --- a/queue-2.6.20/series +++ b/queue-2.6.20/series @@ -10,7 +10,6 @@ bcm43xx-fix-for-oops-on-resume.patch bcm43xx-fix-for-oops-on-ampdu-status.patch agp-intel-agp-bugfix.patch missing-critical-phys_to_virt-in-lib-swiotlb.c.patch -libata-fix-drive-side-80c-cable-check.patch usb-fix-concurrent-buffer-access-in-the-hub-driver.patch usb-audio-fixes-1.patch usb-audio-fixes-2.patch