| Message ID | 20211203095531.GB2480@kili (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | bb14bfc7eb927b47717d82ba7ecc8345d9099cf4 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net-next] net: lan966x: fix a IS_ERR() vs NULL check in lan966x_create_targets() | expand |
The 12/03/2021 12:55, Dan Carpenter wrote: > > The devm_ioremap() function does not return error pointers. It returns > NULL. Reviewed-by: Horatiu Vultur <horatiu.vultur@microchip.com> > > Fixes: db8bcaad5393 ("net: lan966x: add the basic lan966x driver") > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> > --- > drivers/net/ethernet/microchip/lan966x/lan966x_main.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/net/ethernet/microchip/lan966x/lan966x_main.c b/drivers/net/ethernet/microchip/lan966x/lan966x_main.c > index e9e4dca6542d..00930d81521a 100644 > --- a/drivers/net/ethernet/microchip/lan966x/lan966x_main.c > +++ b/drivers/net/ethernet/microchip/lan966x/lan966x_main.c > @@ -83,10 +83,10 @@ static int lan966x_create_targets(struct platform_device *pdev, > begin[idx] = devm_ioremap(&pdev->dev, > iores[idx]->start, > resource_size(iores[idx])); > - if (IS_ERR(begin[idx])) { > + if (!begin[idx]) { > dev_err(&pdev->dev, "Unable to get registers: %s\n", > iores[idx]->name); > - return PTR_ERR(begin[idx]); > + return -ENOMEM; > } > } > > -- > 2.20.1 >
Hello: This patch was applied to netdev/net-next.git (master) by David S. Miller <davem@davemloft.net>: On Fri, 3 Dec 2021 12:55:31 +0300 you wrote: > The devm_ioremap() function does not return error pointers. It returns > NULL. > > Fixes: db8bcaad5393 ("net: lan966x: add the basic lan966x driver") > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> > --- > drivers/net/ethernet/microchip/lan966x/lan966x_main.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) Here is the summary with links: - [net-next] net: lan966x: fix a IS_ERR() vs NULL check in lan966x_create_targets() https://git.kernel.org/netdev/net-next/c/bb14bfc7eb92 You are awesome, thank you!
diff --git a/drivers/net/ethernet/microchip/lan966x/lan966x_main.c b/drivers/net/ethernet/microchip/lan966x/lan966x_main.c index e9e4dca6542d..00930d81521a 100644 --- a/drivers/net/ethernet/microchip/lan966x/lan966x_main.c +++ b/drivers/net/ethernet/microchip/lan966x/lan966x_main.c @@ -83,10 +83,10 @@ static int lan966x_create_targets(struct platform_device *pdev, begin[idx] = devm_ioremap(&pdev->dev, iores[idx]->start, resource_size(iores[idx])); - if (IS_ERR(begin[idx])) { + if (!begin[idx]) { dev_err(&pdev->dev, "Unable to get registers: %s\n", iores[idx]->name); - return PTR_ERR(begin[idx]); + return -ENOMEM; } }
The devm_ioremap() function does not return error pointers. It returns NULL. Fixes: db8bcaad5393 ("net: lan966x: add the basic lan966x driver") Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> --- drivers/net/ethernet/microchip/lan966x/lan966x_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)