Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

YueHaibing and committed by
David S. Miller
02afa9c6 f7ba7dbf

+3 -3
+3 -3
drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c
··· 2370 2370 free: 2371 2371 fsl_mc_object_free(dpcon); 2372 2372 2373 - return NULL; 2373 + return ERR_PTR(err); 2374 2374 } 2375 2375 2376 2376 static void free_dpcon(struct dpaa2_eth_priv *priv, ··· 2394 2394 return NULL; 2395 2395 2396 2396 channel->dpcon = setup_dpcon(priv); 2397 - if (IS_ERR_OR_NULL(channel->dpcon)) { 2398 - err = PTR_ERR_OR_ZERO(channel->dpcon); 2397 + if (IS_ERR(channel->dpcon)) { 2398 + err = PTR_ERR(channel->dpcon); 2399 2399 goto err_setup; 2400 2400 } 2401 2401