[PATCH] Fix array size calculation for intel_pci_probe().

[PATCH] Fix array size calculation for intel_pci_probe().

[Matthias Hopf]

From: Stefan Dirsch <sndirsch@suse.de>

---
 src/intel_module.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/intel_module.c b/src/intel_module.c
index 499814e..cd9c1a3 100644
--- a/src/intel_module.c
+++ b/src/intel_module.c
@@ -298,7 +298,7 @@ static Bool intel_pci_probe(DriverPtr		driver,
 			    intptr_t		match_data)
 {
 	ScrnInfoPtr scrn;
-	PciChipsets intel_pci_chipsets[ARRAY_SIZE(intel_chipsets)];
+	PciChipsets intel_pci_chipsets[ARRAY_SIZE(_intel_chipsets)];
 	int i;
 
 	chipset_info = (void *)match_data;
@@ -319,7 +319,7 @@ static Bool intel_pci_probe(DriverPtr		driver,
 #endif
 	}
 
-	for (i = 0; i < ARRAY_SIZE(intel_chipsets); i++) {
+	for (i = 0; i < ARRAY_SIZE(_intel_chipsets); i++) {
 		intel_pci_chipsets[i].numChipset = intel_chipsets[i].token;
 		intel_pci_chipsets[i].PCIid = intel_chipsets[i].token;
 		intel_pci_chipsets[i].dummy = NULL;
-- 
1.7.3.4

Re: [PATCH] Fix array size calculation for intel_pci_probe().

[Matthias Hopf]

Frankly said, I do not understand why the driver works for others at
all. Array size calculation resulted in 0 due to the sizeof(pointer).

Is xf86ConfigPciEntity a NOP in newer Xservers? That would explain it,
as we're testing the driver with the Xserver on SLE11 (which is pretty
old).

Matthias

-- 
Matthias Hopf <mhopf@suse.de>      __        __   __
Maxfeldstr. 5 / 90409 Nuernberg   (_   | |  (_   |__          mat@mshopf.de
Phone +49-911-74053-715           __)  |_|  __)  |__  R & D   www.mshopf.de