diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-11-21 08:51:56 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-11-26 21:58:47 +0100 |
| commit | 83b98fb46ff136945f9d06a9bf6e6aae2ffc37b3 (patch) | |
| tree | 2bbe8a0d1d87d5fcf966de2ce2ee3df768b9d78c /drivers/net/ethernet/davicom | |
| parent | l2tp: ensure sk->dst is still valid (diff) | |
| download | linux-83b98fb46ff136945f9d06a9bf6e6aae2ffc37b3.tar.xz linux-83b98fb46ff136945f9d06a9bf6e6aae2ffc37b3.zip | |
dm9000: Fix check for disabled wake on LAN
We're trying to check if any options are defined which isn't wha the
existing code does due to confusing & and &&.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/davicom')
| -rw-r--r-- | drivers/net/ethernet/davicom/dm9000.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/davicom/dm9000.c b/drivers/net/ethernet/davicom/dm9000.c index 438f4580bf66..2a22f5256353 100644 --- a/drivers/net/ethernet/davicom/dm9000.c +++ b/drivers/net/ethernet/davicom/dm9000.c @@ -613,7 +613,7 @@ static int dm9000_set_wol(struct net_device *dev, struct ethtool_wolinfo *w) if (!dm->wake_state) irq_set_irq_wake(dm->irq_wake, 1); - else if (dm->wake_state & !opts) + else if (dm->wake_state && !opts) irq_set_irq_wake(dm->irq_wake, 0); } |