Merge tag 'edac_urgent_for_v5.17_rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras

torvalds · torvalds · commit 898b5841ae37 · 2022-02-06T09:57:39.000-08:00
Pull EDAC fixes from Borislav Petkov:
 "Fix altera and xgene EDAC drivers to propagate the correct error code
  from platform_get_irq() so that deferred probing still works"

* tag 'edac_urgent_for_v5.17_rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras:
  EDAC/xgene: Fix deferred probing
  EDAC/altera: Fix deferred probing
diff --git a/drivers/edac/altera_edac.c b/drivers/edac/altera_edac.c
@@ -350,7 +350,7 @@ static int altr_sdram_probe(struct platform_device *pdev)
 	if (irq < 0) {
 		edac_printk(KERN_ERR, EDAC_MC,
 			    "No irq %d in DT\n", irq);
-		return -ENODEV;
+		return irq;
 	}
 
 	/* Arria10 has a 2nd IRQ */
diff --git a/drivers/edac/xgene_edac.c b/drivers/edac/xgene_edac.c
@@ -1919,7 +1919,7 @@ static int xgene_edac_probe(struct platform_device *pdev)
 			irq = platform_get_irq_optional(pdev, i);
 			if (irq < 0) {
 				dev_err(&pdev->dev, "No IRQ resource\n");
-				rc = -EINVAL;
+				rc = irq;
 				goto out_err;
 			}
 			rc = devm_request_irq(&pdev->dev, irq,

Original file line number	Diff line number	Diff line change
`@@ -350,7 +350,7 @@ static int altr_sdram_probe(struct platform_device *pdev)`
`350`	`350`	`if (irq < 0) {`
`351`	`351`	`edac_printk(KERN_ERR, EDAC_MC,`
`352`	`352`	`"No irq %d in DT\n", irq);`
`353`		`- return -ENODEV;`
	`353`	`+ return irq;`
`354`	`354`	`}`
`355`	`355`
`356`	`356`	`/* Arria10 has a 2nd IRQ */`
Original file line number	Diff line number	Diff line change
`@@ -1919,7 +1919,7 @@ static int xgene_edac_probe(struct platform_device *pdev)`
`1919`	`1919`	`irq = platform_get_irq_optional(pdev, i);`
`1920`	`1920`	`if (irq < 0) {`
`1921`	`1921`	`dev_err(&pdev->dev, "No IRQ resource\n");`
`1922`		`- rc = -EINVAL;`
	`1922`	`+ rc = irq;`
`1923`	`1923`	`goto out_err;`
`1924`	`1924`	`}`
`1925`	`1925`	`rc = devm_request_irq(&pdev->dev, irq,`