aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c
diff options
context:
space:
mode:
authorWei Yongjun <weiyongjun1@huawei.com>2017-11-06 11:12:08 +0000
committerDavid S. Miller <davem@davemloft.net>2017-11-08 13:24:44 +0900
commit29130853fe6dee04ad88d0586ff39182fa408a75 (patch)
tree5b071910f82e09f349e314dd1caa8858e65ad448 /drivers/net/ethernet/freescale/dpaa/dpaa_eth.c
parentMerge branch 'qdisc-RED-offload' (diff)
downloadlinux-dev-29130853fe6dee04ad88d0586ff39182fa408a75.tar.xz
linux-dev-29130853fe6dee04ad88d0586ff39182fa408a75.zip
dpaa_eth: fix error return code in dpaa_eth_probe()
Fix to return a negative error code from the dpaa_bp_alloc() error handling case instead of 0, as done elsewhere in this function. Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/freescale/dpaa/dpaa_eth.c')
-rw-r--r--drivers/net/ethernet/freescale/dpaa/dpaa_eth.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c b/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c
index 784dbf5a3e12..7caa8da48421 100644
--- a/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c
+++ b/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c
@@ -2728,11 +2728,11 @@ static int dpaa_eth_probe(struct platform_device *pdev)
/* bp init */
for (i = 0; i < DPAA_BPS_NUM; i++) {
- int err;
-
dpaa_bps[i] = dpaa_bp_alloc(dev);
- if (IS_ERR(dpaa_bps[i]))
+ if (IS_ERR(dpaa_bps[i])) {
+ err = PTR_ERR(dpaa_bps[i]);
goto free_dpaa_bps;
+ }
/* the raw size of the buffers used for reception */
dpaa_bps[i]->raw_size = bpool_buffer_raw_size(i, DPAA_BPS_NUM);
/* avoid runtime computations by keeping the usable size here */