From 5b30ed0d33d2a42ac9b51646beb22dd52f301e04 Mon Sep 17 00:00:00 2001
From: "John W. Linville" <linville@tuxdriver.com>
Date: Wed, 21 Jul 2010 16:36:06 -0400
Subject: [PATCH] --- yaml --- r: 203796 b: refs/heads/master c:
 28eb3e5acfddf1e1c8892df9901e4f32f7f537eb h: refs/heads/master v: v3

---
 [refs]                                               | 2 +-
 trunk/drivers/net/wireless/rtl818x/rtl8180_rtl8225.c | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index abc7ba7de35d..5d0089f2ca6c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8b73fb8e29e9ae0458d36cc0dc25e2717587dfd4
+refs/heads/master: 28eb3e5acfddf1e1c8892df9901e4f32f7f537eb
diff --git a/trunk/drivers/net/wireless/rtl818x/rtl8180_rtl8225.c b/trunk/drivers/net/wireless/rtl818x/rtl8180_rtl8225.c
index 4d2be0d9672b..69e4d4745dae 100644
--- a/trunk/drivers/net/wireless/rtl818x/rtl8180_rtl8225.c
+++ b/trunk/drivers/net/wireless/rtl818x/rtl8180_rtl8225.c
@@ -50,7 +50,10 @@ static void rtl8225_write(struct ieee80211_hw *dev, u8 addr, u16 data)
 	udelay(10);
 
 	for (i = 15; i >= 0; i--) {
-		u16 reg = reg80 | !!(bangdata & (1 << i));
+		u16 reg = reg80;
+
+		if (bangdata & (1 << i))
+			reg |= 1;
 
 		if (i & 1)
 			rtl818x_iowrite16(priv, &priv->map->RFPinsOutput, reg);