From patchwork Mon Aug 17 15:18:14 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bob Copeland X-Patchwork-Id: 42064 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n7HFJP6D012839 for ; Mon, 17 Aug 2009 15:19:25 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756239AbZHQPSr (ORCPT ); Mon, 17 Aug 2009 11:18:47 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756234AbZHQPSr (ORCPT ); Mon, 17 Aug 2009 11:18:47 -0400 Received: from mail.deathmatch.net ([72.66.92.28]:2819 "EHLO mail.deathmatch.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756219AbZHQPSp (ORCPT ); Mon, 17 Aug 2009 11:18:45 -0400 Received: from hash ([72.83.200.195]) (authenticated user bob@bobcopeland.com) by mail.deathmatch.net (using TLSv1/SSLv3 with cipher AES256-SHA (256 bits)); Mon, 17 Aug 2009 11:18:40 -0400 Received: from bob by hash with local (Exim 4.69) (envelope-from ) id 1Md3yQ-0003Qu-Bc; Mon, 17 Aug 2009 11:18:14 -0400 Date: Mon, 17 Aug 2009 11:18:14 -0400 From: Bob Copeland To: linville@tuxdriver.com, Kalle Valo Cc: linux-wireless@vger.kernel.org Subject: [PATCH] wl1251: correct definitions for 0th bit defines Message-ID: <20090817151814.GB13125@hash.localnet> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.18 (2008-05-17) Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org ACX_SLV_SOFT_RESET_BIT and ACX_REG_EEPROM_START_BIT are both defined as "1" in the vendor driver code, but they were defined to be BIT(1) ("2") here. The SOFT_RESET typo ensures that wl1251_boot_soft_reset() doesn't; as a result the device hangs when trying to reprogram the PLL registers while running. Signed-off-by: Bob Copeland Acked-by: Kalle Valo --- drivers/net/wireless/wl12xx/wl1251_reg.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/wl12xx/wl1251_reg.h b/drivers/net/wireless/wl12xx/wl1251_reg.h index 2de47cc..86a8666 100644 --- a/drivers/net/wireless/wl12xx/wl1251_reg.h +++ b/drivers/net/wireless/wl12xx/wl1251_reg.h @@ -309,8 +309,8 @@ enum wl12xx_acx_int_reg { ACX_REG_TABLE_LEN }; -#define ACX_SLV_SOFT_RESET_BIT BIT(1) -#define ACX_REG_EEPROM_START_BIT BIT(1) +#define ACX_SLV_SOFT_RESET_BIT BIT(0) +#define ACX_REG_EEPROM_START_BIT BIT(0) /* Command/Information Mailbox Pointers */