* [PATCH] dm9000: Fix check for disabled wake on LAN
@ 2011-11-21 17:51 Mark Brown
2011-11-26 20:58 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Mark Brown @ 2011-11-21 17:51 UTC (permalink / raw)
To: David S. Miller; +Cc: netdev, patches, Mark Brown
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>
---
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 26be1df..f801754 100644
--- a/drivers/net/ethernet/davicom/dm9000.c
+++ b/drivers/net/ethernet/davicom/dm9000.c
@@ -614,7 +614,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);
}
--
1.7.7.3
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] dm9000: Fix check for disabled wake on LAN
2011-11-21 17:51 [PATCH] dm9000: Fix check for disabled wake on LAN Mark Brown
@ 2011-11-26 20:58 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2011-11-26 20:58 UTC (permalink / raw)
To: broonie; +Cc: netdev, patches
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Mon, 21 Nov 2011 17:51:56 +0000
> 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>
Good catch, applied, thanks.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-11-26 20:59 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-11-21 17:51 [PATCH] dm9000: Fix check for disabled wake on LAN Mark Brown
2011-11-26 20:58 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).