---

yaml --- r: 268210 b: refs/heads/master c: 52a7fb0 h: refs/heads/master v: v3
git-mirror · Sep 6, 2011 · 5774d74 · 5774d74
1 parent e24b581
commit 5774d74
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ce7b393f50e93da441a4a532ff6ca393fb6bd64a
+refs/heads/master: 52a7fb0951b35840a79a5b162fb853b78cec3c09
diff --git a/trunk/drivers/staging/rtl8192e/r8192E_phy.c b/trunk/drivers/staging/rtl8192e/r8192E_phy.c
@@ -937,7 +937,7 @@ static u8 rtl8192_phy_SwChnlStepByStep(struct net_device *dev, u8 channel,
 				break;
 			}
 
-			if (CurrentCmd->CmdID == CmdID_End) {
+			if (CurrentCmd && CurrentCmd->CmdID == CmdID_End) {
 				if ((*stage) == 2) {
 					return true;
 				} else {
@@ -947,6 +947,8 @@ static u8 rtl8192_phy_SwChnlStepByStep(struct net_device *dev, u8 channel,
 				}
 			}
 
+			if (!CurrentCmd)
+				continue;
 			switch (CurrentCmd->CmdID) {
 			case CmdID_SetTxPowerLevel:
 				if (priv->IC_Cut > (u8)VERSION_8190_BD)