X-Git-Url: http://git.samba.org/samba.git/?a=blobdiff_plain;f=drivers%2Fchar%2Fagp%2Fefficeon-agp.c;h=d607f53d8afcc7b3594c2629ab887b4ec5643b72;hb=500b9fc922cbec572f4fd1436533bfaed5011262;hp=aa109cbe0e6e0c5e3884d84a24334c7a2da04a42;hpb=ec2a7587e0a91d5c1afe23a0a73edfce06c5e4e0;p=sfrench%2Fcifs-2.6.git diff --git a/drivers/char/agp/efficeon-agp.c b/drivers/char/agp/efficeon-agp.c index aa109cbe0e6e..d607f53d8afc 100644 --- a/drivers/char/agp/efficeon-agp.c +++ b/drivers/char/agp/efficeon-agp.c @@ -371,6 +371,17 @@ static int __devinit agp_efficeon_probe(struct pci_dev *pdev, bridge->dev = pdev; bridge->capndx = cap_ptr; + /* + * 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)) { + printk(KERN_ERR PFX "Unable to 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. @@ -385,17 +396,6 @@ static int __devinit agp_efficeon_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)) { - printk(KERN_ERR PFX "Unable to Enable PCI device\n"); - agp_put_bridge(bridge); - return -ENODEV; - } - /* Fill in the mode register */ if (cap_ptr) { pci_read_config_dword(pdev,