diff options
| author | Li Hong <lihong.hi@gmail.com> | 2009-10-19 04:33:29 -0400 |
|---|---|---|
| committer | Borislav Petkov <borislav.petkov@amd.com> | 2009-11-04 08:02:32 -0500 |
| commit | a3c4c58085b23d8e878a58dcdd0f8fcf8fad1ccd (patch) | |
| tree | 4d90cbfce9f7e869270127f75a4232c1fc69db9c | |
| parent | b419148e567728f6af0c3b01965c1cc141e3e13a (diff) | |
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.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/edac/amd64_edac.c b/drivers/edac/amd64_edac.c index d4560d9d5a83..3ee539a3fbb4 100644 --- a/drivers/edac/amd64_edac.c +++ b/drivers/edac/amd64_edac.c | |||
| @@ -3163,7 +3163,7 @@ static int __init amd64_edac_init(void) | |||
| 3163 | opstate_init(); | 3163 | opstate_init(); |
| 3164 | 3164 | ||
| 3165 | if (cache_k8_northbridges() < 0) | 3165 | if (cache_k8_northbridges() < 0) |
| 3166 | goto err_exit; | 3166 | return err; |
| 3167 | 3167 | ||
| 3168 | err = pci_register_driver(&amd64_pci_driver); | 3168 | err = pci_register_driver(&amd64_pci_driver); |
| 3169 | if (err) | 3169 | if (err) |
| @@ -3189,8 +3189,6 @@ static int __init amd64_edac_init(void) | |||
| 3189 | 3189 | ||
| 3190 | err_2nd_stage: | 3190 | err_2nd_stage: |
| 3191 | debugf0("2nd stage failed\n"); | 3191 | debugf0("2nd stage failed\n"); |
| 3192 | |||
| 3193 | err_exit: | ||
| 3194 | pci_unregister_driver(&amd64_pci_driver); | 3192 | pci_unregister_driver(&amd64_pci_driver); |
| 3195 | 3193 | ||
| 3196 | return err; | 3194 | return err; |
