diff options
| author | Florian Mickler <florian@mickler.org> | 2011-02-07 23:29:31 +0100 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2011-02-23 18:29:17 +1000 |
| commit | 49495d44dfa4ba76cf7d1ed8fe84746dd9552255 (patch) | |
| tree | bce82f11cf9630f7774e051d557596f96fac225c /drivers/char/agp | |
| parent | 45e4039c3aea597ede44a264cea322908cdedfe9 (diff) | |
| download | blackbird-op-linux-49495d44dfa4ba76cf7d1ed8fe84746dd9552255.tar.gz blackbird-op-linux-49495d44dfa4ba76cf7d1ed8fe84746dd9552255.zip | |
amd64-agp: fix crash at second module load
The module forgot to sometimes unregister some resources.
This fixes Bug #22882.
[Patch updated to 2.6.38-rc3 by Randy Dunlap.]
Tested-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Florian Mickler <florian@mickler.org>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/char/agp')
| -rw-r--r-- | drivers/char/agp/amd64-agp.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/char/agp/amd64-agp.c b/drivers/char/agp/amd64-agp.c index 9252e85706ef..780498d76581 100644 --- a/drivers/char/agp/amd64-agp.c +++ b/drivers/char/agp/amd64-agp.c @@ -773,18 +773,23 @@ int __init agp_amd64_init(void) #else printk(KERN_INFO PFX "You can boot with agp=try_unsupported\n"); #endif + pci_unregister_driver(&agp_amd64_pci_driver); return -ENODEV; } /* First check that we have at least one AMD64 NB */ - if (!pci_dev_present(amd_nb_misc_ids)) + if (!pci_dev_present(amd_nb_misc_ids)) { + pci_unregister_driver(&agp_amd64_pci_driver); return -ENODEV; + } /* Look for any AGP bridge */ agp_amd64_pci_driver.id_table = agp_amd64_pci_promisc_table; err = driver_attach(&agp_amd64_pci_driver.driver); - if (err == 0 && agp_bridges_found == 0) + if (err == 0 && agp_bridges_found == 0) { + pci_unregister_driver(&agp_amd64_pci_driver); err = -ENODEV; + } } return err; } |
