ich777/linux_media
1
0
Fork 0
mirror of https://github.com/tbsdtv/linux_media.git synced 2025-07-23 04:33:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Borislav Petkov
2021-02-15 10:06:58 +01:00
parent 4cbcb73b1c e26124cd5f
commit 6118b48893
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/edac/ppc4xx_edac.c
View File

@@ -1058,7 +1058,7 @@ static int ppc4xx_edac_mc_init(struct mem_ctl_info *mci,
/* Initialize strings */ /* Initialize strings */
mci->mod_name = PPC4XX_EDAC_MODULE_NAME; 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; mci->dev_name = np->full_name;
/* Initialize callbacks */ /* Initialize callbacks */

2
drivers/edac/xgene_edac.c
View File

@@ -1916,7 +1916,7 @@ static int xgene_edac_probe(struct platform_device *pdev)
int i; int i;
for (i = 0; i < 3; i++) { for (i = 0; i < 3; i++) {
irq = platform_get_irq(pdev, i); irq = platform_get_irq_optional(pdev, i);
if (irq < 0) { if (irq < 0) {
dev_err(&pdev->dev, "No IRQ resource\n"); dev_err(&pdev->dev, "No IRQ resource\n");
rc = -EINVAL; rc = -EINVAL;