Commit 69615f19 authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Ben Hutchings

net: ethernet: ax88796: don't call free_irq without request_irq first

commit 82533ad9 upstream.

The function ax_init_dev (which is called only from the driver's .probe
function) calls free_irq in the error path without having requested the
irq in the first place. So drop the free_irq call in the error path.

Fixes: 825a2ff1 ("AX88796 network driver")
Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarBen Hutchings <ben@decadent.org.uk>
parent 9807ef7c
...@@ -769,13 +769,13 @@ static int ax_init_dev(struct net_device *dev) ...@@ -769,13 +769,13 @@ static int ax_init_dev(struct net_device *dev)
ret = ax_mii_init(dev); ret = ax_mii_init(dev);
if (ret) if (ret)
goto out_irq; goto err_out;
ax_NS8390_init(dev, 0); ax_NS8390_init(dev, 0);
ret = register_netdev(dev); ret = register_netdev(dev);
if (ret) if (ret)
goto out_irq; goto err_out;
netdev_info(dev, "%dbit, irq %d, %lx, MAC: %pM\n", netdev_info(dev, "%dbit, irq %d, %lx, MAC: %pM\n",
ei_local->word16 ? 16 : 8, dev->irq, dev->base_addr, ei_local->word16 ? 16 : 8, dev->irq, dev->base_addr,
...@@ -783,9 +783,6 @@ static int ax_init_dev(struct net_device *dev) ...@@ -783,9 +783,6 @@ static int ax_init_dev(struct net_device *dev)
return 0; return 0;
out_irq:
/* cleanup irq */
free_irq(dev->irq, dev);
err_out: err_out:
return ret; return ret;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment