diff options
author | Mark Brown <broonie@kernel.org> | 2014-11-26 20:39:02 +0000 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2014-11-26 20:39:02 +0000 |
commit | 75ff9420448e7bb30ab8265463595e794ce0c3aa (patch) | |
tree | ea00f0cff2f6a272d60a518eb6dde6e14263b5b7 /drivers/edac/i82860_edac.c | |
parent | 4524df83c7fc4f44702099a2db7b3cc938eb111f (diff) | |
parent | 206c5f60a3d902bc4b56dab2de3e88de5eb06108 (diff) | |
download | op-kernel-dev-75ff9420448e7bb30ab8265463595e794ce0c3aa.zip op-kernel-dev-75ff9420448e7bb30ab8265463595e794ce0c3aa.tar.gz |
Merge tag 'v3.18-rc4' into regulator-max77686
Linux 3.18-rc4
Diffstat (limited to 'drivers/edac/i82860_edac.c')
-rw-r--r-- | drivers/edac/i82860_edac.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/edac/i82860_edac.c b/drivers/edac/i82860_edac.c index 3382f63..4382343 100644 --- a/drivers/edac/i82860_edac.c +++ b/drivers/edac/i82860_edac.c @@ -124,7 +124,7 @@ static int i82860_process_error_info(struct mem_ctl_info *mci, dimm->location[0], dimm->location[1], -1, "i82860 UE", ""); else - edac_mc_handle_error(HW_EVENT_ERR_UNCORRECTED, mci, 1, + edac_mc_handle_error(HW_EVENT_ERR_CORRECTED, mci, 1, info->eap, 0, info->derrsyn, dimm->location[0], dimm->location[1], -1, "i82860 CE", ""); |