summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBorislav Petkov <borislav.petkov@amd.com>2009-12-21 18:55:18 +0100
committerGreg Kroah-Hartman <gregkh@suse.de>2010-01-06 15:05:16 -0800
commit9127720087953642a8308b373a76f38916577f0e (patch)
tree49d590614a247135490fec8bf38b6b8c5b433d78
parent15383230c0603460f1479610b3dc59e70dc73611 (diff)
amd64_edac: fix forcing module load/unload
commit 43f5e68733cfe8bed3c30b5c14c4993dffb29766 upstream. Clear the override flag after force-loading the module. Signed-off-by: Borislav Petkov <borislav.petkov@amd.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/edac/amd64_edac.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/edac/amd64_edac.c b/drivers/edac/amd64_edac.c
index 22910c648343..a0bcfba13d17 100644
--- a/drivers/edac/amd64_edac.c
+++ b/drivers/edac/amd64_edac.c
@@ -2836,9 +2836,8 @@ static int amd64_check_ecc_enabled(struct amd64_pvt *pvt)
amd64_printk(KERN_WARNING, "%s", ecc_warning);
return -ENODEV;
}
- } else
- /* CLEAR the override, since BIOS controlled it */
ecc_enable_override = 0;
+ }
return 0;
}