Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ccf92824 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by David S. Miller
Browse files

ravb: Add missing free_irq() calls to ravb_close() 



When reopening the network device on ra7795/salvator-x, e.g. after a
DHCP timeout:

    IP-Config: Reopening network devices...
    genirq: Flags mismatch irq 139. 00000000 (eth0:ch0:rx_be) vs. 00000000 (ravb e6800000.ethernet eth0: cannot request IRQ eth0:ch0:rx_be
    IP-Config: Failed to open eth0
    IP-Config: No network devices available

The "mismatch" is due to requesting an IRQ that is already in use,
while IRQF_PROBE_SHARED wasn't set.

However, the real cause is that ravb_close() doesn't release any of the
R-Car Gen3-specific secondary IRQs.

Add the missing free_irq() calls to fix this.

Fixes: f51bdc23 ("ravb: Add dma queue interrupt support")
Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Acked-by: default avatarSergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f82731b4

drivers/net/ethernet/renesas/ravb_main.c

+6 −1
Original line number Original line Diff line number Diff line
@@ -1667,8 +1667,13 @@ static int ravb_close(struct net_device *ndev) 
		priv->phydev = NULL;

		priv->phydev = NULL;

	}

	}





	if (priv->chip_id == RCAR_GEN3)

	if (priv->chip_id != RCAR_GEN2) {

		free_irq(priv->tx_irqs[RAVB_NC], ndev);

		free_irq(priv->rx_irqs[RAVB_NC], ndev);

		free_irq(priv->tx_irqs[RAVB_BE], ndev);

		free_irq(priv->rx_irqs[RAVB_BE], ndev);

		free_irq(priv->emac_irq, ndev);

		free_irq(priv->emac_irq, ndev);

	}

	free_irq(ndev->irq, ndev);

	free_irq(ndev->irq, ndev);





	napi_disable(&priv->napi[RAVB_NC]);

	napi_disable(&priv->napi[RAVB_NC]);