dpaa2-eth: free already allocated channels on probe defer

[ Upstream commit 5aa4277d4368c099223bbcd3a9086f3351a12ce9 ]

The setup_dpio() function tries to allocate a number of channels equal
to the number of CPUs online. When there are not enough DPCON objects
already probed, the function will return EPROBE_DEFER. When this
happens, the already allocated channels are not freed. This results in
the incapacity of properly probing the next time around.
Fix this by freeing the channels on the error path.

Fixes: d7f5a9d89a55 ("dpaa2-eth: defer probe on object allocate")
Signed-off-by: Ioana Ciornei <ioana.ciornei@nxp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c
index 0acb11557ed1ce120b11e6bb9c361076936f6d1b..5d2da74e2306c636f3aa80cb20e7b3a43eb65be0 100644 (file)
--- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c
+++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c
@@ -2166,8 +2166,16 @@ err_set_cdan:
 err_service_reg:
        free_channel(priv, channel);
 err_alloc_ch:
-       if (err == -EPROBE_DEFER)
+       if (err == -EPROBE_DEFER) {
+               for (i = 0; i < priv->num_channels; i++) {
+                       channel = priv->channel[i];
+                       nctx = &channel->nctx;
+                       dpaa2_io_service_deregister(channel->dpio, nctx, dev);
+                       free_channel(priv, channel);
+               }
+               priv->num_channels = 0;
                return err;
+       }
 
        if (cpumask_empty(&priv->dpio_cpumask)) {
                dev_err(dev, "No cpu with an affine DPIO/DPCON\n");