From 7f684015670a8d65dc73bc1b65e87e5174b39a81 Mon Sep 17 00:00:00 2001
From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Mon, 14 May 2012 23:57:29 +0300
Subject: [PATCH] --- yaml --- r: 313966 b: refs/heads/master c:
 9be02923371718265ea050a5415dc4fefc4e6a64 h: refs/heads/master v: v3

---
 [refs]                                                    | 2 +-
 trunk/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_n.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 188ed80c669f..4b97852246bb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8fd9d059af12786341dec5a688e607bcdb372238
+refs/heads/master: 9be02923371718265ea050a5415dc4fefc4e6a64
diff --git a/trunk/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_n.c b/trunk/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_n.c
index 13b261517cce..366718146418 100644
--- a/trunk/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_n.c
+++ b/trunk/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_n.c
@@ -14358,7 +14358,7 @@ void wlc_phy_nphy_tkip_rifs_war(struct brcms_phy *pi, u8 rifs)
 
 	wlc_phy_write_txmacreg_nphy(pi, holdoff, delay);
 
-	if (pi && pi->sh && (pi->sh->_rifs_phy != rifs))
+	if (pi->sh && (pi->sh->_rifs_phy != rifs))
 		pi->sh->_rifs_phy = rifs;
 }