From: Nathan Lynch <ntl@pobox.com>
Date: Tue, 14 Nov 2006 10:03:30 +0000 (-0800)
Subject: [PATCH] nvidiafb: fix unreachable code in nv10GetConfig
X-Git-Tag: v2.6.19-rc6~17
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=d6e89cb6cd3a10eb203914093642f580c20476d4;p=linux-2.6-omap-h63xx.git

[PATCH] nvidiafb: fix unreachable code in nv10GetConfig

Fix binary/logical operator typo which leads to unreachable code.  Noticed
while looking at other issues; I don't have the relevant hardware to test
this.

Signed-off-by: Nathan Lynch <ntl@pobox.com>
Cc: "Antonino A. Daplas" <adaplas@pol.net>
Acked-by: James Simmons <jsimmons@infradead.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/drivers/video/nvidia/nv_setup.c b/drivers/video/nvidia/nv_setup.c
index 61dc46fecf2..eab3e282a4d 100644
--- a/drivers/video/nvidia/nv_setup.c
+++ b/drivers/video/nvidia/nv_setup.c
@@ -262,7 +262,7 @@ static void nv10GetConfig(struct nvidia_par *par)
 #endif
 
 	dev = pci_find_slot(0, 1);
-	if ((par->Chipset && 0xffff) == 0x01a0) {
+	if ((par->Chipset & 0xffff) == 0x01a0) {
 		int amt = 0;
 
 		pci_read_config_dword(dev, 0x7c, &amt);