The following commit has been merged in the linux branch: commit a3c4c58085b23d8e878a58dcdd0f8fcf8fad1ccd Author: Li Hong lihong.hi@gmail.com Date: Mon Oct 19 16:33:29 2009 +0800
amd64_edac: fix a wrong goto clause in amd64_edac.c
In amd64_edac_init(void) in amd64_edac.c, cache_k8_northbridges() is called before pci_register_driver. If it fails, should exit with err directly.
Signed-off-by: Li Hong lihong.hi@gmail.com Acked-by: Doug Thompson dougthompson@xmission.com Signed-off-by: Borislav Petkov borislav.petkov@amd.com
diff --git a/drivers/edac/amd64_edac.c b/drivers/edac/amd64_edac.c index d4560d9..3ee539a 100644 --- a/drivers/edac/amd64_edac.c +++ b/drivers/edac/amd64_edac.c @@ -3163,7 +3163,7 @@ static int __init amd64_edac_init(void) opstate_init();
if (cache_k8_northbridges() < 0) - goto err_exit; + return err;
err = pci_register_driver(&amd64_pci_driver); if (err) @@ -3189,8 +3189,6 @@ static int __init amd64_edac_init(void)
err_2nd_stage: debugf0("2nd stage failed\n"); - -err_exit: pci_unregister_driver(&amd64_pci_driver);
return err;