---

yaml --- r: 276238 b: refs/heads/master c: 83b98fb h: refs/heads/master v: v3
git-mirror · Nov 26, 2011 · 8c57979 · 8c57979
1 parent f406a4a
commit 8c57979
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 71b1391a41289735676be02e35239e5aa9fe6ba6
+refs/heads/master: 83b98fb46ff136945f9d06a9bf6e6aae2ffc37b3
diff --git a/trunk/drivers/net/ethernet/davicom/dm9000.c b/trunk/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);
 	}