From 82b33b320af66122dcad9660763f130a04c7f6a5 Mon Sep 17 00:00:00 2001 From: Emmanuel Grumbach Date: Sun, 14 Apr 2013 14:41:03 +0300 Subject: [PATCH] --- yaml --- r: 369847 b: refs/heads/master c: d7dad550e6ddb96db9d3e4d322f7d1dd8a6a9c8d h: refs/heads/master i: 369845: f88cc929908f1a173fae3f1f8994ccf01b1e1905 369843: 5842f529e6c3f8f7f908e52ecdba9108d1117ce4 369839: a6e8fd198e3b99a2a838898b59aae899a803a097 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/iwlwifi/mvm/utils.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index bcd7171103e4..1b802a689103 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 178bdb5791f18e33b5a368acee6fab5bb64396fe +refs/heads/master: d7dad550e6ddb96db9d3e4d322f7d1dd8a6a9c8d diff --git a/trunk/drivers/net/wireless/iwlwifi/mvm/utils.c b/trunk/drivers/net/wireless/iwlwifi/mvm/utils.c index 0cc8d8c0d393..687b34e387ac 100644 --- a/trunk/drivers/net/wireless/iwlwifi/mvm/utils.c +++ b/trunk/drivers/net/wireless/iwlwifi/mvm/utils.c @@ -253,8 +253,9 @@ int iwl_mvm_rx_fw_error(struct iwl_mvm *mvm, struct iwl_rx_cmd_buffer *rxb, u8 first_antenna(u8 mask) { BUILD_BUG_ON(ANT_A != BIT(0)); /* using ffs is wrong if not */ - WARN_ON_ONCE(!mask); /* ffs will return 0 if mask is zeroed */ - return (u8)(BIT(ffs(mask))); + if (WARN_ON_ONCE(!mask)) /* ffs will return 0 if mask is zeroed */ + return BIT(0); + return BIT(ffs(mask) - 1); } /*