diff mbox

[patch-net-next,v3] net: ethernet: ti: cpsw: fix buld break when NET_POLL_CONTROLLER

Message ID 1421689956-14369-1-git-send-email-balbi@ti.com
State Accepted, archived
Delegated to: David Miller
Headers show

Commit Message

Felipe Balbi Jan. 19, 2015, 5:52 p.m. UTC
Commit c03abd84634d (net: ethernet: cpsw: don't requests IRQs we don't
use) left one build breakage when NET_POLL_CONTROLLER is enabled.

Fix this build break by referring to the correct irqs_table array.

Fixes: c03abd84634d (net: ethernet: cpsw: don't requests IRQs we don't use)
Reported-by: kbuild test robot <fengguang.wu@intel.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
---
 drivers/net/ethernet/ti/cpsw.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

David Miller Jan. 19, 2015, 7:45 p.m. UTC | #1
From: Felipe Balbi <balbi@ti.com>
Date: Mon, 19 Jan 2015 11:52:36 -0600

> Commit c03abd84634d (net: ethernet: cpsw: don't requests IRQs we don't
> use) left one build breakage when NET_POLL_CONTROLLER is enabled.
> 
> Fix this build break by referring to the correct irqs_table array.
> 
> Fixes: c03abd84634d (net: ethernet: cpsw: don't requests IRQs we don't use)
> Reported-by: kbuild test robot <fengguang.wu@intel.com>
> Signed-off-by: Felipe Balbi <balbi@ti.com>

Applied, thanks.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c
index ba09ff3c1695..a0e9a2b384f8 100644
--- a/drivers/net/ethernet/ti/cpsw.c
+++ b/drivers/net/ethernet/ti/cpsw.c
@@ -1625,8 +1625,8 @@  static void cpsw_ndo_poll_controller(struct net_device *ndev)
 
 	cpsw_intr_disable(priv);
 	cpdma_ctlr_int_ctrl(priv->dma, false);
-	cpsw_rx_interrupt(priv->irq[0], priv);
-	cpsw_tx_interrupt(priv->irq[1], priv);
+	cpsw_rx_interrupt(priv->irqs_table[0], priv);
+	cpsw_tx_interrupt(priv->irqs_table[1], priv);
 	cpdma_ctlr_int_ctrl(priv->dma, true);
 	cpsw_intr_enable(priv);
 }