diff options
| author | David S. Miller <davem@davemloft.net> | 2018-05-04 15:58:56 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-05-04 15:58:56 +0200 |
| commit | a7b15ab887e5b8e9803136b5a4a0008d7a3dea86 (patch) | |
| tree | ca5342d29badb2a3cce2a353b786c8ab4a993c1e /drivers/net/ethernet/realtek | |
| parent | Merge branch 'sh_eth-complain-on-access-to-unimplemented-TSU-registers' (diff) | |
| parent | Merge tag 'linux-kselftest-4.17-rc4' of git://git.kernel.org/pub/scm/linux/ke... (diff) | |
| download | linux-a7b15ab887e5b8e9803136b5a4a0008d7a3dea86.tar.xz linux-a7b15ab887e5b8e9803136b5a4a0008d7a3dea86.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Overlapping changes in selftests Makefile.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/realtek')
| -rw-r--r-- | drivers/net/ethernet/realtek/8139too.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/realtek/8139too.c b/drivers/net/ethernet/realtek/8139too.c index d24b47b8e0b2..d118da5a10a2 100644 --- a/drivers/net/ethernet/realtek/8139too.c +++ b/drivers/net/ethernet/realtek/8139too.c @@ -2224,7 +2224,7 @@ static void rtl8139_poll_controller(struct net_device *dev) struct rtl8139_private *tp = netdev_priv(dev); const int irq = tp->pci_dev->irq; - disable_irq(irq); + disable_irq_nosync(irq); rtl8139_interrupt(irq, dev); enable_irq(irq); } |