Skip to content

Commit 996148e

Browse files
committed
Merge tag 'edac_urgent_for_v5.15_rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras
Pull EDAC fixes from Borislav Petkov: "Fix two EDAC drivers using the wrong value type for the DIMM mode" * tag 'edac_urgent_for_v5.15_rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras: EDAC/dmc520: Assign the proper type to dimm->edac_mode EDAC/synopsys: Fix wrong value type assignment for edac_mode
2 parents 299d6e4 + 5460728 commit 996148e

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

drivers/edac/dmc520_edac.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -464,7 +464,7 @@ static void dmc520_init_csrow(struct mem_ctl_info *mci)
464464
dimm->grain = pvt->mem_width_in_bytes;
465465
dimm->dtype = dt;
466466
dimm->mtype = mt;
467-
dimm->edac_mode = EDAC_FLAG_SECDED;
467+
dimm->edac_mode = EDAC_SECDED;
468468
dimm->nr_pages = pages_per_rank / csi->nr_channels;
469469
}
470470
}

drivers/edac/synopsys_edac.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -782,7 +782,7 @@ static void init_csrows(struct mem_ctl_info *mci)
782782

783783
for (j = 0; j < csi->nr_channels; j++) {
784784
dimm = csi->channels[j]->dimm;
785-
dimm->edac_mode = EDAC_FLAG_SECDED;
785+
dimm->edac_mode = EDAC_SECDED;
786786
dimm->mtype = p_data->get_mtype(priv->baseaddr);
787787
dimm->nr_pages = (size >> PAGE_SHIFT) / csi->nr_channels;
788788
dimm->grain = SYNPS_EDAC_ERR_GRAIN;

0 commit comments

Comments
 (0)