From b188e8ced46609db8013500f9b1c161e1c04ea7e Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Wed, 18 Aug 2010 00:26:34 +0000 Subject: [PATCH] --- yaml --- r: 209857 b: refs/heads/master c: 8539992f6091eb8206c781421312157d0c282e6e h: refs/heads/master i: 209855: 3a90429bb112c4f5ff29a8079a677905b575fc82 v: v3 --- [refs] | 2 +- trunk/drivers/net/ll_temac_main.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 50254d2da7b8..b328ab270093 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 502820a3161e2f228125977d133dd80eea2932d1 +refs/heads/master: 8539992f6091eb8206c781421312157d0c282e6e diff --git a/trunk/drivers/net/ll_temac_main.c b/trunk/drivers/net/ll_temac_main.c index 4eea3f70c5cf..09b813f1c3cd 100644 --- a/trunk/drivers/net/ll_temac_main.c +++ b/trunk/drivers/net/ll_temac_main.c @@ -902,8 +902,8 @@ temac_poll_controller(struct net_device *ndev) disable_irq(lp->tx_irq); disable_irq(lp->rx_irq); - ll_temac_rx_irq(lp->tx_irq, lp); - ll_temac_tx_irq(lp->rx_irq, lp); + ll_temac_rx_irq(lp->tx_irq, ndev); + ll_temac_tx_irq(lp->rx_irq, ndev); enable_irq(lp->tx_irq); enable_irq(lp->rx_irq);