From ae9502fc22135dcb8d9a95f1cc60dcd961996388 Mon Sep 17 00:00:00 2001
From: Chris Yungmann <yungmann.chris@gmail.com>
Date: Sun, 3 Jun 2012 00:57:57 -0500
Subject: [PATCH] --- yaml --- r: 314015 b: refs/heads/master c:
 2b0446c4205fb3e77b205276ecd36d30b82cbb84 h: refs/heads/master i:   314013:
 730d385120d1b660cbc3927683e60f2926827ad0   314011:
 43cacbfb5c7289418a5ba6fb2047a6f9c2140efd   314007:
 f6668625b46181c8eb4892a327b1137775e9bd7a   313999:
 a001e5c068e1121ad37f5399daa862b10ae6765f   313983:
 db36d0b6bcefcb48e1126cf0ad6d43987f8b1666 v: v3

---
 [refs]                                                  | 2 +-
 trunk/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c | 3 +--
 trunk/drivers/net/wireless/brcm80211/brcmsmac/aiutils.h | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index a5cab2c62cfa..d24b8d5ae246 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ebf348fcd088e3ffc6e76f6f349e27d30604865b
+refs/heads/master: 2b0446c4205fb3e77b205276ecd36d30b82cbb84
diff --git a/trunk/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c b/trunk/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c
index 6d8b7213643a..3c6f9b1e8d05 100644
--- a/trunk/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c
+++ b/trunk/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c
@@ -631,9 +631,8 @@ uint ai_cc_reg(struct si_pub *sih, uint regoff, u32 mask, u32 val)
 	cc = sii->icbus->drv_cc.core;
 
 	/* mask and set */
-	if (mask || val) {
+	if (mask || val)
 		bcma_maskset32(cc, regoff, ~mask, val);
-	}
 
 	/* readback */
 	w = bcma_read32(cc, regoff);
diff --git a/trunk/drivers/net/wireless/brcm80211/brcmsmac/aiutils.h b/trunk/drivers/net/wireless/brcm80211/brcmsmac/aiutils.h
index d9f04a683bdb..d6fa9829af9a 100644
--- a/trunk/drivers/net/wireless/brcm80211/brcmsmac/aiutils.h
+++ b/trunk/drivers/net/wireless/brcm80211/brcmsmac/aiutils.h
@@ -193,7 +193,7 @@ extern void ai_detach(struct si_pub *sih);
 extern uint ai_cc_reg(struct si_pub *sih, uint regoff, u32 mask, u32 val);
 extern void ai_clkctl_init(struct si_pub *sih);
 extern u16 ai_clkctl_fast_pwrup_delay(struct si_pub *sih);
-extern bool ai_clkctl_cc(struct si_pub *sih, uint mode);
+extern bool ai_clkctl_cc(struct si_pub *sih, enum bcma_clkmode mode);
 extern bool ai_deviceremoved(struct si_pub *sih);
 
 extern void ai_pci_down(struct si_pub *sih);