From: Mark Brown Date: Mon, 21 Nov 2011 07:51:56 +0000 (+0000) Subject: dm9000: Fix check for disabled wake on LAN X-Git-Tag: MMI-PSA29.97-13-9~17939^2~24 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=83b98fb46ff136945f9d06a9bf6e6aae2ffc37b3;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git 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 Signed-off-by: David S. Miller --- 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); }