]> git.baikalelectronics.ru Git - kernel.git/commitdiff
dm9000: Fix check for disabled wake on LAN
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 21 Nov 2011 07:51:56 +0000 (07:51 +0000)
committerDavid S. Miller <davem@davemloft.net>
Sat, 26 Nov 2011 20:58:47 +0000 (15:58 -0500)
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>
drivers/net/ethernet/davicom/dm9000.c

index 438f4580bf66207539761761e37c42e0ef303b78..2a22f52563532201891fa4a720d11180886b714c 100644 (file)
@@ -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);
        }