diff options
| author | YueHaibing <yuehaibing@huawei.com> | 2020-08-04 16:26:43 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-08-05 02:10:24 +0300 |
| commit | 02afa9c66bb954c6959877c70d9e128dcf0adce7 (patch) | |
| tree | de2fb77474484369ee48e73f9b44cbb8c486d1ad /drivers/net | |
| parent | f7ba7dbf4f7af67b5936ff1cbd40a3254b409ebf (diff) | |
| download | linux-02afa9c66bb954c6959877c70d9e128dcf0adce7.tar.xz | |
dpaa2-eth: Fix passing zero to 'PTR_ERR' warning
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>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c | 6 |
1 files 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 83b1e974bff0..457106e761be 100644 --- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c +++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c @@ -2370,7 +2370,7 @@ close: free: fsl_mc_object_free(dpcon); - return NULL; + return ERR_PTR(err); } static void free_dpcon(struct dpaa2_eth_priv *priv, @@ -2394,8 +2394,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; } |