Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Lots of overlapping changes and parallel additions, stuff like that. Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
@@ -2260,8 +2260,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");
|
||||
|
Reference in New Issue
Block a user