Skip to content

Commit 03c959b

Browse files
committed
Merge branch 'at91-4.19-trunk/backup_mode' into linux-4.19-at91
2 parents 86f4bc1 + a1d838a commit 03c959b

1 file changed

Lines changed: 7 additions & 3 deletions

File tree

drivers/mtd/nand/raw/atmel/pmecc.c

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -847,9 +847,13 @@ static struct atmel_pmecc *atmel_pmecc_create(struct platform_device *pdev,
847847
return ERR_CAST(pmecc->regs.errloc);
848848

849849
res = platform_get_resource(pdev, IORESOURCE_MEM, timing_res_idx);
850-
pmecc->regs.timing = devm_ioremap_resource(dev, res);
851-
if (IS_ERR(pmecc->regs.timing))
852-
return ERR_CAST(pmecc->regs.timing);
850+
if (!res) {
851+
pmecc->regs.timing = NULL;
852+
} else {
853+
pmecc->regs.timing = devm_ioremap_resource(dev, res);
854+
if (IS_ERR(pmecc->regs.timing))
855+
return ERR_CAST(pmecc->regs.timing);
856+
}
853857

854858
/* Disable all interrupts before registering the PMECC handler. */
855859
writel(0xffffffff, pmecc->regs.base + ATMEL_PMECC_IDR);

0 commit comments

Comments
 (0)