mirror of
https://github.com/hardkernel/linux.git
synced 2026-06-07 19:30:30 +09:00
dpaa2-eth: Fix passing zero to 'PTR_ERR' warning
[ Upstream commit02afa9c66b] 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:d7f5a9d89a("dpaa2-eth: defer probe on object allocate") Signed-off-by: YueHaibing <yuehaibing@huawei.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
committed by
Greg Kroah-Hartman
parent
5a963aa721
commit
3a82f4bfd2
@@ -2090,7 +2090,7 @@ close:
|
||||
free:
|
||||
fsl_mc_object_free(dpcon);
|
||||
|
||||
return NULL;
|
||||
return ERR_PTR(err);
|
||||
}
|
||||
|
||||
static void free_dpcon(struct dpaa2_eth_priv *priv,
|
||||
@@ -2114,8 +2114,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;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user