diff options
Diffstat (limited to 'drivers/char/agp/intel-agp.c')
-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 5bbc7be203a6..ddf5def1b0da 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, | |||
908 | dev_info(&pdev->dev, "Intel %s Chipset\n", intel_agp_chipsets[i].name); | 908 | dev_info(&pdev->dev, "Intel %s Chipset\n", intel_agp_chipsets[i].name); |
909 | 909 | ||
910 | /* | 910 | /* |
911 | * If the device has not been properly setup, the following will catch | ||
912 | * the problem and should stop the system from crashing. | ||
913 | * 20030610 - hamish@zot.org | ||
914 | */ | ||
915 | if (pci_enable_device(pdev)) { | ||
916 | dev_err(&pdev->dev, "can't enable PCI device\n"); | ||
917 | agp_put_bridge(bridge); | ||
918 | return -ENODEV; | ||
919 | } | ||
920 | |||
921 | /* | ||
911 | * The following fixes the case where the BIOS has "forgotten" to | 922 | * The following fixes the case where the BIOS has "forgotten" to |
912 | * provide an address range for the GART. | 923 | * provide an address range for the GART. |
913 | * 20030610 - hamish@zot.org | 924 | * 20030610 - hamish@zot.org |
@@ -921,17 +932,6 @@ static int __devinit agp_intel_probe(struct pci_dev *pdev, | |||
921 | } | 932 | } |
922 | } | 933 | } |
923 | 934 | ||
924 | /* | ||
925 | * If the device has not been properly setup, the following will catch | ||
926 | * the problem and should stop the system from crashing. | ||
927 | * 20030610 - hamish@zot.org | ||
928 | */ | ||
929 | if (pci_enable_device(pdev)) { | ||
930 | dev_err(&pdev->dev, "can't enable PCI device\n"); | ||
931 | agp_put_bridge(bridge); | ||
932 | return -ENODEV; | ||
933 | } | ||
934 | |||
935 | /* Fill in the mode register */ | 935 | /* Fill in the mode register */ |
936 | if (cap_ptr) { | 936 | if (cap_ptr) { |
937 | pci_read_config_dword(pdev, | 937 | pci_read_config_dword(pdev, |