openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

net: ll_temac: Fix return value check in temac_probe() 

In case of error, the function devm_ioremap() returns NULL pointer
not ERR_PTR(). The IS_ERR() test in the return value check should
be replaced with NULL test.

Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
Acked-by: Esben Haabendal <esben@geanix.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Wei Yongjun 2020-04-27 09:40:52 +00:00 committed by David S. Miller
parent 0a699302be
commit c4db9934a3
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/net/ethernet/xilinx/ll_temac_main.c
View File

@ -1410,9 +1410,9 @@ static int temac_probe(struct platform_device *pdev)
res = platform_get_resource(pdev, IORESOURCE_MEM, 0); res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
lp->regs = devm_ioremap(&pdev->dev, res->start, lp->regs = devm_ioremap(&pdev->dev, res->start,
resource_size(res)); resource_size(res));
if (IS_ERR(lp->regs)) { if (!lp->regs) {
dev_err(&pdev->dev, "could not map TEMAC registers\n"); dev_err(&pdev->dev, "could not map TEMAC registers\n");
return PTR_ERR(lp->regs); return -ENOMEM;
} }
/* Select register access functions with the specified /* Select register access functions with the specified
@ -1505,10 +1505,10 @@ static int temac_probe(struct platform_device *pdev)
res = platform_get_resource(pdev, IORESOURCE_MEM, 1); res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
lp->sdma_regs = devm_ioremap(&pdev->dev, res->start, lp->sdma_regs = devm_ioremap(&pdev->dev, res->start,
resource_size(res)); resource_size(res));
if (IS_ERR(lp->sdma_regs)) { if (!lp->sdma_regs) {
dev_err(&pdev->dev, dev_err(&pdev->dev,
"could not map DMA registers\n"); "could not map DMA registers\n");
return PTR_ERR(lp->sdma_regs); return -ENOMEM;
} }
if (pdata->dma_little_endian) { if (pdata->dma_little_endian) {
lp->dma_in = temac_dma_in32_le; lp->dma_in = temac_dma_in32_le;