Commit 6118b488 authored by Borislav Petkov's avatar Borislav Petkov
Browse files

Merge branch 'edac-misc' into edac-updates-for-v5.12

parents 4cbcb73b e26124cd

drivers/edac/ppc4xx_edac.c

+1 −1
Original line number Diff line number Diff line
@@ -1058,7 +1058,7 @@ static int ppc4xx_edac_mc_init(struct mem_ctl_info *mci, 
	/* Initialize strings */



	mci->mod_name		= PPC4XX_EDAC_MODULE_NAME;

	mci->ctl_name		= ppc4xx_edac_match->compatible,

	mci->ctl_name		= ppc4xx_edac_match->compatible;

	mci->dev_name		= np->full_name;



	/* Initialize callbacks */

drivers/edac/xgene_edac.c

+1 −1
Original line number Diff line number Diff line
@@ -1916,7 +1916,7 @@ static int xgene_edac_probe(struct platform_device *pdev) 
		int i;



		for (i = 0; i < 3; i++) {

			irq = platform_get_irq(pdev, i);

			irq = platform_get_irq_optional(pdev, i);

			if (irq < 0) {

				dev_err(&pdev->dev, "No IRQ resource\n");

				rc = -EINVAL;