* [PATCH] dpaa2-eth: Fix passing zero to 'PTR_ERR' warning
@ 2020-08-04 13:26 YueHaibing
2020-08-04 23:11 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: YueHaibing @ 2020-08-04 13:26 UTC (permalink / raw)
To: ioana.ciornei, ruxandra.radulescu, davem, kuba, andrew
Cc: netdev, linux-kernel, YueHaibing
Fix smatch warning:
drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c:2419
alloc_channel() warn: passing zero to 'ERR_PTR'
setup_dpcon() should return ERR_PTR(err) instead of zero in error
handling case.
Fixes: d7f5a9d89a55 ("dpaa2-eth: defer probe on object allocate")
Signed-off-by: YueHaibing <yuehaibing@huawei.com>
---
drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c
index 9b4028c0e34c..5f680b953a90 100644
--- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c
+++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c
@@ -2375,7 +2375,7 @@ static struct fsl_mc_device *setup_dpcon(struct dpaa2_eth_priv *priv)
free:
fsl_mc_object_free(dpcon);
- return NULL;
+ return ERR_PTR(err);
}
static void free_dpcon(struct dpaa2_eth_priv *priv,
@@ -2399,8 +2399,8 @@ alloc_channel(struct dpaa2_eth_priv *priv)
return NULL;
channel->dpcon = setup_dpcon(priv);
- if (IS_ERR_OR_NULL(channel->dpcon)) {
- err = PTR_ERR_OR_ZERO(channel->dpcon);
+ if (IS_ERR(channel->dpcon)) {
+ err = PTR_ERR(channel->dpcon);
goto err_setup;
}
--
2.17.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] dpaa2-eth: Fix passing zero to 'PTR_ERR' warning
2020-08-04 13:26 [PATCH] dpaa2-eth: Fix passing zero to 'PTR_ERR' warning YueHaibing
@ 2020-08-04 23:11 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2020-08-04 23:11 UTC (permalink / raw)
To: yuehaibing
Cc: ioana.ciornei, ruxandra.radulescu, kuba, andrew, netdev, linux-kernel
From: YueHaibing <yuehaibing@huawei.com>
Date: Tue, 4 Aug 2020 21:26:43 +0800
> Fix smatch warning:
>
> drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c:2419
> alloc_channel() warn: passing zero to 'ERR_PTR'
>
> setup_dpcon() should return ERR_PTR(err) instead of zero in error
> handling case.
>
> Fixes: d7f5a9d89a55 ("dpaa2-eth: defer probe on object allocate")
> Signed-off-by: YueHaibing <yuehaibing@huawei.com>
Applied and queued up for -stable, thank you.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-08-04 23:11 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-08-04 13:26 [PATCH] dpaa2-eth: Fix passing zero to 'PTR_ERR' warning YueHaibing
2020-08-04 23:11 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).