Commit a3bc528c authored by David S. Miller's avatar David S. Miller

Merge bk://kernel.bkbits.net/acme/net-2.5

into nuts.ninka.net:/home/davem/src/BK/net-2.5
parents b5d558da 567cf042
...@@ -1275,8 +1275,6 @@ static int __init agp_intel_probe(struct pci_dev *pdev, ...@@ -1275,8 +1275,6 @@ static int __init agp_intel_probe(struct pci_dev *pdev,
u8 cap_ptr = 0; u8 cap_ptr = 0;
cap_ptr = pci_find_capability(pdev, PCI_CAP_ID_AGP); cap_ptr = pci_find_capability(pdev, PCI_CAP_ID_AGP);
if (!cap_ptr)
return -ENODEV;
bridge = agp_alloc_bridge(); bridge = agp_alloc_bridge();
if (!bridge) if (!bridge)
...@@ -1417,9 +1415,11 @@ static int __init agp_intel_probe(struct pci_dev *pdev, ...@@ -1417,9 +1415,11 @@ static int __init agp_intel_probe(struct pci_dev *pdev,
printk(KERN_INFO PFX "Detected an Intel %s Chipset.\n", name); printk(KERN_INFO PFX "Detected an Intel %s Chipset.\n", name);
/* Fill in the mode register */ /* Fill in the mode register */
if (cap_ptr) {
pci_read_config_dword(pdev, pci_read_config_dword(pdev,
bridge->capndx+PCI_AGP_STATUS, bridge->capndx+PCI_AGP_STATUS,
&bridge->mode); &bridge->mode);
}
pci_set_drvdata(pdev, bridge); pci_set_drvdata(pdev, bridge);
return agp_add_bridge(bridge); return agp_add_bridge(bridge);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment