rpms/kernel/F-7 linux-2.6-libata-pata-hpt3x2n-correct-revision-boundary.patch, NONE, 1.1 kernel-2.6.spec, 1.3177, 1.3178

[Dave Jones (davej)]

Author: davej

Update of /cvs/pkgs/rpms/kernel/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26179

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-libata-pata-hpt3x2n-correct-revision-boundary.patch 
Log Message:
* Mon May 21 2007 Dave Jones <davej at redhat.com>
- hpt3x2n: Correct revision boundary


linux-2.6-libata-pata-hpt3x2n-correct-revision-boundary.patch:

--- NEW FILE linux-2.6-libata-pata-hpt3x2n-correct-revision-boundary.patch ---
>From davej  Mon May 21 09:55:32 2007
Return-path: <linux-ide-owner at vger.kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.1.8 (2007-02-13) on
	gelk.kernelslacker.org
X-Spam-Level: 
X-Spam-Status: No, score=-2.4 required=5.0 tests=AWL,BAYES_00 autolearn=ham
	version=3.1.8
Envelope-to: davej at codemonkey.org.uk
Delivery-date: Mon, 21 May 2007 14:53:17 +0100
Received: from testure.choralone.org [194.9.77.134]
	by gelk.kernelslacker.org with IMAP (fetchmail-6.3.6)
	for <davej at localhost> (single-drop); Mon, 21 May 2007 09:55:32 -0400 (EDT)
Received: from vger.kernel.org ([209.132.176.167])
	by testure.choralone.org with esmtp (Exim 4.63)
	(envelope-from <linux-ide-owner at vger.kernel.org>)
	id 1Hq8K4-0003Ov-L0
	for davej at codemonkey.org.uk; Mon, 21 May 2007 14:53:17 +0100
Received: (majordomo at vger.kernel.org) by vger.kernel.org via listexpand
	id S1756248AbXEUNwz (ORCPT <rfc822;davej at codemonkey.org.uk>);
	Mon, 21 May 2007 09:52:55 -0400
Received: (majordomo at vger.kernel.org) by vger.kernel.org id S1762141AbXEUNwz
	(ORCPT <rfc822;linux-ide-outgoing>); Mon, 21 May 2007 09:52:55 -0400
Received: from outpipe-village-512-1.bc.nu ([81.2.110.250]:38718 "EHLO
	the-village.bc.nu" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org
	with ESMTP id S1756248AbXEUNwy (ORCPT
	<rfc822;linux-ide at vger.kernel.org>); Mon, 21 May 2007 09:52:54 -0400
Received: from the-village.bc.nu (localhost.localdomain [127.0.0.1])
	by the-village.bc.nu (8.13.8/8.13.8) with ESMTP id l4LDv1RB022969;
	Mon, 21 May 2007 14:57:01 +0100
Date:	Mon, 21 May 2007 14:57:01 +0100
From:	Alan Cox <alan at lxorguk.ukuu.org.uk>
To:	akpm at osdl.org, linux-ide at vger.kernel.org, jeff at garzik.org
Subject: [PATCH] hpt3x2n: Correct revision boundary
Message-ID: <20070521145701.7283c30a at the-village.bc.nu>
X-Mailer: Claws Mail 2.9.1 (GTK+ 2.10.8; i386-redhat-linux-gnu)
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Sender:	linux-ide-owner at vger.kernel.org
Precedence: bulk
X-Mailing-List:	linux-ide at vger.kernel.org
Status: RO
Content-Length: 987
Lines: 23

We have a revision that isn't correctly claimed as two drivers both go
for it: Fix the test accordingly. Noticed originally by Bill Nottingham.

Signed-off-by: Alan Cox <alan at redhat.com>

diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.22-rc1-mm1/drivers/ata/pata_hpt3x2n.c linux-2.6.22-rc1-mm1/drivers/ata/pata_hpt3x2n.c
--- linux.vanilla-2.6.22-rc1-mm1/drivers/ata/pata_hpt3x2n.c	2007-05-18 16:21:46.000000000 +0100
+++ linux-2.6.22-rc1-mm1/drivers/ata/pata_hpt3x2n.c	2007-05-18 16:33:57.000000000 +0100
@@ -521,8 +521,8 @@
 			/* 371N if rev > 1 */
 			break;
 		case PCI_DEVICE_ID_TTI_HPT372:
-			/* 372N if rev >= 1*/
-			if (class_rev == 0)
+			/* 372N if rev >= 2*/
+			if (class_rev < 2)
 				return -ENODEV;
 			break;
 		case PCI_DEVICE_ID_TTI_HPT302:
-
To unsubscribe from this list: send the line "unsubscribe linux-ide" in
the body of a message to majordomo at vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/kernel-2.6.spec,v
retrieving revision 1.3177
retrieving revision 1.3178
diff -u -r1.3177 -r1.3178
--- kernel-2.6.spec	21 May 2007 21:23:28 -0000	1.3177
+++ kernel-2.6.spec	21 May 2007 21:39:48 -0000	1.3178
@@ -617,6 +617,7 @@
 Patch2206: linux-2.6-libata-sata_nv-wildcard-removal.patch
 Patch2207: linux-2.6-libata-pata-pcmcia-new-ident.patch
 Patch2208: linux-2.6-libata-atiixp-ids.patch
+Patch2209: linux-2.6-libata-pata-hpt3x2n-correct-revision-boundary.patch
 
 # Wireless bits
 Patch2300: linux-2.6-wireless.patch
@@ -1399,6 +1400,8 @@
 %patch2207 -p1
 # Add libata ID's for ATI SB700
 %patch2208 -p1
+# hpt3x2n: Correct revision boundary
+%patch2209 -p1
 
 # Add critical wireless updates from 2.6.22
 %patch2300 -p1
@@ -2407,6 +2410,9 @@
 
 %changelog
 * Mon May 21 2007 Dave Jones <davej at redhat.com>
+- hpt3x2n: Correct revision boundary
+
+* Mon May 21 2007 Dave Jones <davej at redhat.com>
 - Add missing braces to nfs_readpages()
 
 * Mon May 21 2007 John W. Linville <linville at redhat.com>