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

Commit 33b7107f authored by Christian Riesch's avatar Christian Riesch Committed by David S. Miller
Browse files

net: davinci_emac: Replace devm_request_irq with request_irq 



In commit 6892b41d

Author: Lad, Prabhakar <prabhakar.csengg@gmail.com>
Date:   Tue Jun 25 21:24:51 2013 +0530
net: davinci: emac: Convert to devm_* api

the call of request_irq is replaced by devm_request_irq and the call
of free_irq is removed. But since interrupts are requested in
emac_dev_open, doing ifconfig up/down on the board requests the
interrupts again each time, causing devm_request_irq to fail. The
interface is dead until the device is rebooted.

This patch reverts said commit partially: It changes the driver back
to use request_irq instead of devm_request_irq, puts free_irq back in
place, but keeps the remaining changes of the original patch.

Reported-by: default avatarJon Ringle <jon@ringle.org>
Signed-off-by: default avatarChristian Riesch <christian.riesch@omicron.at>
Cc: Lad, Prabhakar <prabhakar.csengg@gmail.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c27f0872

drivers/net/ethernet/ti/davinci_emac.c

+21 −4
Original line number Diff line number Diff line
@@ -1532,7 +1532,7 @@ static int emac_dev_open(struct net_device *ndev) 
	struct device *emac_dev = &ndev->dev;

	u32 cnt;

	struct resource *res;

	int ret;

	int q, m, ret;

	int i = 0;

	int k = 0;

	struct emac_priv *priv = netdev_priv(ndev);
@@ -1567,8 +1567,7 @@ static int emac_dev_open(struct net_device *ndev) 


	while ((res = platform_get_resource(priv->pdev, IORESOURCE_IRQ, k))) {

		for (i = res->start; i <= res->end; i++) {

			if (devm_request_irq(&priv->pdev->dev, i, emac_irq,

					     0, ndev->name, ndev))

			if (request_irq(i, emac_irq, 0, ndev->name, ndev))

				goto rollback;

		}

		k++;
@@ -1641,7 +1640,15 @@ static int emac_dev_open(struct net_device *ndev) 


rollback:



	dev_err(emac_dev, "DaVinci EMAC: devm_request_irq() failed");

	dev_err(emac_dev, "DaVinci EMAC: request_irq() failed");



	for (q = k; k >= 0; k--) {

		for (m = i; m >= res->start; m--)

			free_irq(m, ndev);

		res = platform_get_resource(priv->pdev, IORESOURCE_IRQ, k-1);

		m = res->end;

	}



	ret = -EBUSY;

err:

	pm_runtime_put(&priv->pdev->dev);
@@ -1659,6 +1666,9 @@ static int emac_dev_open(struct net_device *ndev) 
 */

static int emac_dev_stop(struct net_device *ndev)

{

	struct resource *res;

	int i = 0;

	int irq_num;

	struct emac_priv *priv = netdev_priv(ndev);

	struct device *emac_dev = &ndev->dev;
@@ -1674,6 +1684,13 @@ static int emac_dev_stop(struct net_device *ndev) 
	if (priv->phydev)

		phy_disconnect(priv->phydev);



	/* Free IRQ */

	while ((res = platform_get_resource(priv->pdev, IORESOURCE_IRQ, i))) {

		for (irq_num = res->start; irq_num <= res->end; irq_num++)

			free_irq(irq_num, priv->ndev);

		i++;

	}



	if (netif_msg_drv(priv))

		dev_notice(emac_dev, "DaVinci EMAC: %s stopped\n", ndev->name);