diff options
| author | Linus Torvalds | 2009-11-05 19:53:24 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2009-11-05 19:53:24 +0100 |
| commit | bd901751e7ab9ddba335b19643605b3cf8517078 (patch) | |
| tree | 1cbe73d100f80cc93e8e8f662f7399dd6f05a94f | |
| parent | sgi-gru: decrapfiy options_write() function (diff) | |
| parent | amd64_edac: fix CECCs reporting (diff) | |
| download | kernel-qcow2-linux-bd901751e7ab9ddba335b19643605b3cf8517078.tar.gz kernel-qcow2-linux-bd901751e7ab9ddba335b19643605b3cf8517078.tar.xz kernel-qcow2-linux-bd901751e7ab9ddba335b19643605b3cf8517078.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp:
amd64_edac: fix CECCs reporting
amd64_edac: fix a wrong goto clause in amd64_edac.c
| -rw-r--r-- | drivers/edac/amd64_edac.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/edac/amd64_edac.c b/drivers/edac/amd64_edac.c index d4560d9d5a83..a38831c82649 100644 --- a/drivers/edac/amd64_edac.c +++ b/drivers/edac/amd64_edac.c @@ -2254,7 +2254,7 @@ static inline void __amd64_decode_bus_error(struct mem_ctl_info *mci, { u32 ec = ERROR_CODE(info->nbsl); u32 xec = EXT_ERROR_CODE(info->nbsl); - int ecc_type = info->nbsh & (0x3 << 13); + int ecc_type = (info->nbsh >> 13) & 0x3; /* Bail early out if this was an 'observed' error */ if (PP(ec) == K8_NBSL_PP_OBS) @@ -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; |