diff options
Diffstat (limited to 'drivers/char/agp/efficeon-agp.c')
| -rw-r--r-- | drivers/char/agp/efficeon-agp.c | 22 |
1 files changed, 11 insertions, 11 deletions
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 | |||
| @@ -372,6 +372,17 @@ static int __devinit agp_efficeon_probe(struct pci_dev *pdev, | |||
| 372 | bridge->capndx = cap_ptr; | 372 | bridge->capndx = cap_ptr; |
| 373 | 373 | ||
| 374 | /* | 374 | /* |
| 375 | * If the device has not been properly setup, the following will catch | ||
| 376 | * the problem and should stop the system from crashing. | ||
| 377 | * 20030610 - hamish@zot.org | ||
| 378 | */ | ||
| 379 | if (pci_enable_device(pdev)) { | ||
| 380 | printk(KERN_ERR PFX "Unable to Enable PCI device\n"); | ||
| 381 | agp_put_bridge(bridge); | ||
| 382 | return -ENODEV; | ||
| 383 | } | ||
| 384 | |||
| 385 | /* | ||
| 375 | * The following fixes the case where the BIOS has "forgotten" to | 386 | * The following fixes the case where the BIOS has "forgotten" to |
| 376 | * provide an address range for the GART. | 387 | * provide an address range for the GART. |
| 377 | * 20030610 - hamish@zot.org | 388 | * 20030610 - hamish@zot.org |
| @@ -385,17 +396,6 @@ static int __devinit agp_efficeon_probe(struct pci_dev *pdev, | |||
| 385 | } | 396 | } |
| 386 | } | 397 | } |
| 387 | 398 | ||
| 388 | /* | ||
| 389 | * If the device has not been properly setup, the following will catch | ||
| 390 | * the problem and should stop the system from crashing. | ||
| 391 | * 20030610 - hamish@zot.org | ||
| 392 | */ | ||
| 393 | if (pci_enable_device(pdev)) { | ||
| 394 | printk(KERN_ERR PFX "Unable to Enable PCI device\n"); | ||
| 395 | agp_put_bridge(bridge); | ||
| 396 | return -ENODEV; | ||
| 397 | } | ||
| 398 | |||
| 399 | /* Fill in the mode register */ | 399 | /* Fill in the mode register */ |
| 400 | if (cap_ptr) { | 400 | if (cap_ptr) { |
| 401 | pci_read_config_dword(pdev, | 401 | pci_read_config_dword(pdev, |
