diff options
| author | Nathan Lynch <ntl@pobox.com> | 2006-11-14 11:03:30 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-11-14 18:09:27 +0100 |
| commit | d6e89cb6cd3a10eb203914093642f580c20476d4 (patch) | |
| tree | 0e84f5d037405a5202b487e5b79b5d1ba686d77e /drivers/video/nvidia/nv_setup.c | |
| parent | [PATCH] autofs4: panic after mount fail (diff) | |
| download | linux-d6e89cb6cd3a10eb203914093642f580c20476d4.tar.xz linux-d6e89cb6cd3a10eb203914093642f580c20476d4.zip | |
[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>
Diffstat (limited to 'drivers/video/nvidia/nv_setup.c')
| -rw-r--r-- | drivers/video/nvidia/nv_setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/nvidia/nv_setup.c b/drivers/video/nvidia/nv_setup.c index 61dc46fecf2b..eab3e282a4de 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); |