From patchwork Mon Nov 21 17:51:56 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 126881 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id ECBFBB71EE for ; Tue, 22 Nov 2011 04:52:23 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753764Ab1KURwT (ORCPT ); Mon, 21 Nov 2011 12:52:19 -0500 Received: from opensource.wolfsonmicro.com ([80.75.67.52]:46520 "EHLO opensource.wolfsonmicro.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751517Ab1KURwS (ORCPT ); Mon, 21 Nov 2011 12:52:18 -0500 Received: from finisterre.wolfsonmicro.main (unknown [87.246.78.26]) by opensource.wolfsonmicro.com (Postfix) with ESMTPSA id F110D1108EE; Mon, 21 Nov 2011 17:52:16 +0000 (GMT) Received: from broonie by finisterre.wolfsonmicro.main with local (Exim 4.77) (envelope-from ) id 1RSY2D-0001K5-P9; Mon, 21 Nov 2011 17:52:14 +0000 From: Mark Brown To: "David S. Miller" Cc: netdev@vger.kernel.org, patches@opensource.wolfsonmicro.com, Mark Brown Subject: [PATCH] dm9000: Fix check for disabled wake on LAN Date: Mon, 21 Nov 2011 17:51:56 +0000 Message-Id: <1321897916-5030-1-git-send-email-broonie@opensource.wolfsonmicro.com> X-Mailer: git-send-email 1.7.7.3 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 --- 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); }