diff options
| author | Borislav Petkov <bp@suse.de> | 2021-02-15 10:06:58 +0100 |
|---|---|---|
| committer | Borislav Petkov <bp@suse.de> | 2021-02-15 10:06:58 +0100 |
| commit | 6118b488933b0311e28420d4cd1ee06caf59682b (patch) | |
| tree | ffea58bbbdd6656598e997994bafa11c63935a53 | |
| parent | 4cbcb73b1c7a73a13b336e0c048601d6e8eecaa8 (diff) | |
| parent | e26124cd5f7099949109608845bba9e9bf96599c (diff) | |
| download | linux-6118b488933b0311e28420d4cd1ee06caf59682b.tar.gz linux-6118b488933b0311e28420d4cd1ee06caf59682b.tar.bz2 linux-6118b488933b0311e28420d4cd1ee06caf59682b.zip | |
Merge branch 'edac-misc' into edac-updates-for-v5.12
| -rw-r--r-- | drivers/edac/ppc4xx_edac.c | 2 | ||||
| -rw-r--r-- | drivers/edac/xgene_edac.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/edac/ppc4xx_edac.c b/drivers/edac/ppc4xx_edac.c index 677095769182..6793f6d799e7 100644 --- a/drivers/edac/ppc4xx_edac.c +++ b/drivers/edac/ppc4xx_edac.c @@ -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 */ diff --git a/drivers/edac/xgene_edac.c b/drivers/edac/xgene_edac.c index 1d2c27a00a4a..2ccd1db5e98f 100644 --- a/drivers/edac/xgene_edac.c +++ b/drivers/edac/xgene_edac.c @@ -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; |