OSDN Git Service

dpaa_eth: fix error return code in dpaa_eth_probe()
authorWei Yongjun <weiyongjun1@huawei.com>
Mon, 6 Nov 2017 11:12:08 +0000 (11:12 +0000)
committerDavid S. Miller <davem@davemloft.net>
Wed, 8 Nov 2017 04:24:44 +0000 (13:24 +0900)
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>
drivers/net/ethernet/freescale/dpaa/dpaa_eth.c

index 784dbf5..7caa8da 100644 (file)
@@ -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 */