tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

[AGPGART] Fix wrong ID in via-agp.c

there is a wrong id in drivers/char/agp/via-agp.c
#define PCI_DEVICE_ID_VIA_CX700 0x8324
It must be 0x0324

Notice that PCI_DEVICE_ID_VIA_CX700 is also used in
drivers/i2c/busses/i2c-viapro.c and
drivers/ide/pci/via82cxxx.c

So, I think that constant must be renamed to avoid conflicting.
I attached a proposed patch.

Signed-off-by: Dave Jones <davej@redhat.com>

authored by

Gabriel Mansi and committed by
Dave Jones bbdfff86 705962cc

+4 -3
+3 -3
drivers/char/agp/via-agp.c
··· 384 384 .device_id = PCI_DEVICE_ID_VIA_P4M800CE, 385 385 .chipset_name = "VT3314", 386 386 }, 387 - /* CX700 */ 387 + /* VT3324 / CX700 */ 388 388 { 389 - .device_id = PCI_DEVICE_ID_VIA_CX700, 389 + .device_id = PCI_DEVICE_ID_VIA_VT3324, 390 390 .chipset_name = "CX700", 391 391 }, 392 392 /* VT3336 */ ··· 540 540 ID(PCI_DEVICE_ID_VIA_83_87XX_1), 541 541 ID(PCI_DEVICE_ID_VIA_3296_0), 542 542 ID(PCI_DEVICE_ID_VIA_P4M800CE), 543 - ID(PCI_DEVICE_ID_VIA_CX700), 543 + ID(PCI_DEVICE_ID_VIA_VT3324), 544 544 ID(PCI_DEVICE_ID_VIA_VT3336), 545 545 ID(PCI_DEVICE_ID_VIA_P4M890), 546 546 { }
+1
include/linux/pci_ids.h
··· 1288 1288 #define PCI_DEVICE_ID_VIA_8363_0 0x0305 1289 1289 #define PCI_DEVICE_ID_VIA_P4M800CE 0x0314 1290 1290 #define PCI_DEVICE_ID_VIA_P4M890 0x0327 1291 + #define PCI_DEVICE_ID_VIA_VT3324 0x0324 1291 1292 #define PCI_DEVICE_ID_VIA_VT3336 0x0336 1292 1293 #define PCI_DEVICE_ID_VIA_8371_0 0x0391 1293 1294 #define PCI_DEVICE_ID_VIA_8501_0 0x0501