commit 83b98fb46ff136945f9d06a9bf6e6aae2ffc37b3
author Mark Brown <broonie@opensource.wolfsonmicro.com> Mon Nov 21 07:51:56 2011 +0000
committer David S. Miller <davem@davemloft.net> Sat Nov 26 15:58:47 2011 -0500
tree 2bbe8a0d1d87d5fcf966de2ce2ee3df768b9d78c
parent 71b1391a41289735676be02e35239e5aa9fe6ba6

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>

drivers/net/ethernet/davicom/dm9000.c

diff --git a/drivers/net/ethernet/davicom/dm9000.c b/drivers/net/ethernet/davicom/dm9000.c
index 438f458..2a22f52 100644
--- a/drivers/net/ethernet/davicom/dm9000.c
+++ b/drivers/net/ethernet/davicom/dm9000.c
@@ -613,7 +613,7 @@
 
 		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);
 	}