summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLi Hong <lihong.hi@gmail.com>2009-10-19 16:33:29 +0800
committerBorislav Petkov <borislav.petkov@amd.com>2009-11-04 14:02:32 +0100
commita3c4c58085b23d8e878a58dcdd0f8fcf8fad1ccd (patch)
tree4d90cbfce9f7e869270127f75a4232c1fc69db9c
parentb419148e567728f6af0c3b01965c1cc141e3e13a (diff)
downloadop-kernel-dev-a3c4c58085b23d8e878a58dcdd0f8fcf8fad1ccd.zip
op-kernel-dev-a3c4c58085b23d8e878a58dcdd0f8fcf8fad1ccd.tar.gz
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>
-rw-r--r--drivers/edac/amd64_edac.c4
1 files changed, 1 insertions, 3 deletions
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;
OpenPOWER on IntegriCloud