diff options
author | Linus Torvalds | 2009-08-04 15:35:47 -0700 |
---|---|---|
committer | Linus Torvalds | 2009-08-04 15:35:47 -0700 |
commit | c71c090ff9c474d70af4796b5ea9f548a9d3b6b8 (patch) | |
tree | 56e2d691b6d4851e84e9a0c5bc367852370224b0 /drivers | |
parent | 78ec75cd1c81e01909005f392954c797f686d7bc (diff) | |
parent | c2718348b41a8e7646516d9af8bb0231c6a44374 (diff) |
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: print debug statements only on error
amd64_edac: fix ECC checking
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/edac/amd64_edac.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/edac/amd64_edac.c b/drivers/edac/amd64_edac.c index 24964c1d0af9..e2a10bcba7a1 100644 --- a/drivers/edac/amd64_edac.c +++ b/drivers/edac/amd64_edac.c @@ -868,6 +868,8 @@ static void amd64_read_dbam_reg(struct amd64_pvt *pvt) goto err_reg; } + return; + err_reg: debugf0("Error reading F2x%03x.\n", reg); } @@ -2634,6 +2636,8 @@ static void amd64_read_mc_registers(struct amd64_pvt *pvt) amd64_dump_misc_regs(pvt); + return; + err_reg: debugf0("Reading an MC register failed\n"); @@ -2977,6 +2981,9 @@ static int amd64_check_ecc_enabled(struct amd64_pvt *pvt) "ECC is enabled by BIOS, Proceeding " "with EDAC module initialization\n"); + /* Signal good ECC status */ + ret = 0; + /* CLEAR the override, since BIOS controlled it */ ecc_enable_override = 0; } |