diff options
| author | Arnaud Patard <apatard@mandriva.com> | 2006-10-12 22:33:31 +0200 |
|---|---|---|
| committer | Francois Romieu <romieu@electric-eye.fr.zoreil.com> | 2006-10-12 22:10:44 +0200 |
| commit | 733b736c91dd2c556f35dffdcf77e667cf10cefc (patch) | |
| tree | aeb1631abe0b6ee60d7216e6dbe7226c66073e3d | |
| parent | 73f5e28b336772c4b08ee82e5bf28ab872898ee1 (diff) | |
| download | linux-733b736c91dd2c556f35dffdcf77e667cf10cefc.tar.bz2 | |
r8169: fix infinite loop during hotplug
Bug reported for PCMCIA.
Signed-off-by: Arnaud Patard <apatard@mandriva.com>
Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
| -rw-r--r-- | drivers/net/r8169.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c index c7309e98f89d..c2c9a86e445c 100644 --- a/drivers/net/r8169.c +++ b/drivers/net/r8169.c @@ -2702,6 +2702,7 @@ static void rtl8169_down(struct net_device *dev) struct rtl8169_private *tp = netdev_priv(dev); void __iomem *ioaddr = tp->mmio_addr; unsigned int poll_locked = 0; + unsigned int intrmask; rtl8169_delete_timer(dev); @@ -2740,8 +2741,11 @@ core_down: * 2) dev->change_mtu * -> rtl8169_poll can not be issued again and re-enable the * interruptions. Let's simply issue the IRQ down sequence again. + * + * No loop if hotpluged or major error (0xffff). */ - if (RTL_R16(IntrMask)) + intrmask = RTL_R16(IntrMask); + if (intrmask && (intrmask != 0xffff)) goto core_down; rtl8169_tx_clear(tp); |