diff options
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/char/agp/intel-agp.c | 22 | 
1 files changed, 11 insertions, 11 deletions
diff --git a/drivers/char/agp/intel-agp.c b/drivers/char/agp/intel-agp.c index 5bbc7be203a..ddf5def1b0d 100644 --- a/drivers/char/agp/intel-agp.c +++ b/drivers/char/agp/intel-agp.c @@ -908,6 +908,17 @@ static int __devinit agp_intel_probe(struct pci_dev *pdev,  	dev_info(&pdev->dev, "Intel %s Chipset\n", intel_agp_chipsets[i].name);  	/* +	* If the device has not been properly setup, the following will catch +	* the problem and should stop the system from crashing. +	* 20030610 - hamish@zot.org +	*/ +	if (pci_enable_device(pdev)) { +		dev_err(&pdev->dev, "can't enable PCI device\n"); +		agp_put_bridge(bridge); +		return -ENODEV; +	} + +	/*  	* The following fixes the case where the BIOS has "forgotten" to  	* provide an address range for the GART.  	* 20030610 - hamish@zot.org @@ -921,17 +932,6 @@ static int __devinit agp_intel_probe(struct pci_dev *pdev,  		}  	} -	/* -	* If the device has not been properly setup, the following will catch -	* the problem and should stop the system from crashing. -	* 20030610 - hamish@zot.org -	*/ -	if (pci_enable_device(pdev)) { -		dev_err(&pdev->dev, "can't enable PCI device\n"); -		agp_put_bridge(bridge); -		return -ENODEV; -	} -  	/* Fill in the mode register */  	if (cap_ptr) {  		pci_read_config_dword(pdev,  |