diff options
author | David S. Miller <davem@davemloft.net> | 2014-10-10 15:39:22 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-10-10 15:39:22 -0400 |
commit | 01d2d484e49e9bc0ed9b5fdaf345a0e2bf35ffed (patch) | |
tree | 755e1ac9da55cb85cdf1af2dbad21379019a1b03 /drivers/net/ethernet/broadcom/bcmsysport.c | |
parent | 35b7a1915aa33da812074744647db0d9262a555c (diff) | |
parent | 61b423a8a0bd9aeaa046f9a24bed42e3a953a936 (diff) | |
download | blackbird-op-linux-01d2d484e49e9bc0ed9b5fdaf345a0e2bf35ffed.tar.gz blackbird-op-linux-01d2d484e49e9bc0ed9b5fdaf345a0e2bf35ffed.zip |
Merge branch 'bcmgenet_systemport'
Florian Fainelli says:
====================
net: bcmgenet & systemport fixes
This patch series fixes an off-by-one error introduced during a previous
change, and the two other fixes fix a wake depth imbalance situation for
the Wake-on-LAN interrupt line.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/broadcom/bcmsysport.c')
-rw-r--r-- | drivers/net/ethernet/broadcom/bcmsysport.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/ethernet/broadcom/bcmsysport.c b/drivers/net/ethernet/broadcom/bcmsysport.c index 075688188644..9ae36979bdee 100644 --- a/drivers/net/ethernet/broadcom/bcmsysport.c +++ b/drivers/net/ethernet/broadcom/bcmsysport.c @@ -436,7 +436,8 @@ static int bcm_sysport_set_wol(struct net_device *dev, /* Flag the device and relevant IRQ as wakeup capable */ if (wol->wolopts) { device_set_wakeup_enable(kdev, 1); - enable_irq_wake(priv->wol_irq); + if (priv->wol_irq_disabled) + enable_irq_wake(priv->wol_irq); priv->wol_irq_disabled = 0; } else { device_set_wakeup_enable(kdev, 0); |