Commit 898b5841 authored Feb 06, 2022 by Linus Torvalds

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

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

parents 90c9e950 dfd0dfb9

drivers/edac/altera_edac.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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 */

drivers/edac/xgene_edac.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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,