path: root/drivers/net/ethernet/realtek/8139cp.c
diff options
authorJason Wang <jasowang@redhat.com>2012-04-11 22:10:54 +0000
committerDavid S. Miller <davem@davemloft.net>2012-04-13 13:41:52 -0400
commita8c9cb106fe79c28d6b7f1397652cadd228715ff (patch)
tree9e6e765d0b579bd84e680b544ad57ce15455e421 /drivers/net/ethernet/realtek/8139cp.c
parent03662e41c7cff64a776bfb1b3816de4be43de881 (diff)
8139cp: set intr mask after its handler is registered
We set intr mask before its handler is registered, this does not work well when 8139cp is sharing irq line with other devices. As the irq could be enabled by the device before 8139cp's hander is registered which may lead unhandled irq. Fix this by introducing an helper cp_irq_enable() and call it after request_irq(). Signed-off-by: Jason Wang <jasowang@redhat.com> Reviewed-by: Flavio Leitner <fbl@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/realtek/8139cp.c')
1 files changed, 8 insertions, 2 deletions
diff --git a/drivers/net/ethernet/realtek/8139cp.c b/drivers/net/ethernet/realtek/8139cp.c
index abc79076f86..b3287c0fe27 100644
--- a/drivers/net/ethernet/realtek/8139cp.c
+++ b/drivers/net/ethernet/realtek/8139cp.c
@@ -958,6 +958,11 @@ static inline void cp_start_hw (struct cp_private *cp)
cpw8(Cmd, RxOn | TxOn);
+static void cp_enable_irq(struct cp_private *cp)
+ cpw16_f(IntrMask, cp_intr_mask);
static void cp_init_hw (struct cp_private *cp)
struct net_device *dev = cp->dev;
@@ -997,8 +1002,6 @@ static void cp_init_hw (struct cp_private *cp)
cpw16(MultiIntr, 0);
- cpw16_f(IntrMask, cp_intr_mask);
cpw8_f(Cfg9346, Cfg9346_Lock);
@@ -1130,6 +1133,8 @@ static int cp_open (struct net_device *dev)
if (rc)
goto err_out_hw;
+ cp_enable_irq(cp);
mii_check_media(&cp->mii_if, netif_msg_link(cp), true);
@@ -2031,6 +2036,7 @@ static int cp_resume (struct pci_dev *pdev)
/* FIXME: sh*t may happen if the Rx ring buffer is depleted */
cp_init_rings_index (cp);
cp_init_hw (cp);
+ cp_enable_irq(cp);
netif_start_queue (dev);
spin_lock_irqsave (&cp->lock, flags);