Commit 996148ee authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 299d6e47 54607282

drivers/edac/dmc520_edac.c

+1 −1
Original line number Diff line number Diff line
@@ -464,7 +464,7 @@ static void dmc520_init_csrow(struct mem_ctl_info *mci) 
			dimm->grain	= pvt->mem_width_in_bytes;

			dimm->dtype	= dt;

			dimm->mtype	= mt;

			dimm->edac_mode	= EDAC_FLAG_SECDED;

			dimm->edac_mode	= EDAC_SECDED;

			dimm->nr_pages	= pages_per_rank / csi->nr_channels;

		}

	}

drivers/edac/synopsys_edac.c

+1 −1
Original line number Diff line number Diff line
@@ -782,7 +782,7 @@ static void init_csrows(struct mem_ctl_info *mci) 


		for (j = 0; j < csi->nr_channels; j++) {

			dimm		= csi->channels[j]->dimm;

			dimm->edac_mode	= EDAC_FLAG_SECDED;

			dimm->edac_mode	= EDAC_SECDED;

			dimm->mtype	= p_data->get_mtype(priv->baseaddr);

			dimm->nr_pages	= (size >> PAGE_SHIFT) / csi->nr_channels;

			dimm->grain	= SYNPS_EDAC_ERR_GRAIN;