From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from smtp-out3.tiscali.nl ([195.241.79.178]:40848 "EHLO smtp-out3.tiscali.nl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751200AbYAJToi (ORCPT ); Thu, 10 Jan 2008 14:44:38 -0500 Message-ID: <47866EE9.80003@tiscali.nl> (sfid-20080110_194446_530350_8D372329) Date: Thu, 10 Jan 2008 20:15:53 +0100 From: Roel Kluin <12o3l@tiscali.nl> MIME-Version: 1.0 To: linville@tuxdriver.com, lkml CC: linux-wireless@vger.kernel.org Subject: [PATCH wireless/arlan] Replace logical- by bit-and References: <4722453E.2090801@tiscali.nl> <472248AC.7080201@tiscali.nl> In-Reply-To: <472248AC.7080201@tiscali.nl> Content-Type: text/plain; charset=ISO-8859-1 Sender: linux-wireless-owner@vger.kernel.org List-ID: Totally untested patch below from linus' git tree. The && is incorrect, right? from drivers/net/wireless/arlan.h:390: #define ARLAN_POWER 0x40 #define ARLAN_ACCESS 0x80 Replace logical and by bit-and Signed-off-by: Roel Kluin <12o3l@tiscali.nl> --- diff --git a/drivers/net/wireless/arlan.h b/drivers/net/wireless/arlan.h index 3ed1df7..7b7498f 100644 --- a/drivers/net/wireless/arlan.h +++ b/drivers/net/wireless/arlan.h @@ -485,7 +485,7 @@ struct arlan_private { #define clearClearInterrupt(dev){\ writeControlRegister(dev,readControlRegister(dev) & ~ARLAN_CLEAR_INTERRUPT);} #define setPowerOff(dev){\ - writeControlRegister(dev,readControlRegister(dev) | (ARLAN_POWER && ARLAN_ACCESS));\ + writeControlRegister(dev, readControlRegister(dev) | (ARLAN_POWER & ARLAN_ACCESS));\ writeControlRegister(dev,readControlRegister(dev) & ~ARLAN_ACCESS);} #define setPowerOn(dev){\ writeControlRegister(dev,readControlRegister(dev) & ~(ARLAN_POWER)); }