From: Larry Finger <Larry.Finger@lwfinger.net>
Date: Thu, 1 Sep 2011 17:23:19 +0000 (-0500)
Subject: staging: rtl8192e: Fix smatch error in r8192E_phy.c
X-Git-Tag: MMI-PSA29.97-13-9~18234^2^2~683
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=52a7fb0951b35840a79a5b162fb853b78cec3c09;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

staging: rtl8192e: Fix smatch error in r8192E_phy.c

Smatch reports the following:

  CHECK   drivers/staging/rtl8192e/r8192E_phy.c
drivers/staging/rtl8192e/r8192E_phy.c +940 rtl8192_phy_SwChnlStepByStep(92) error: potential null derefence 'CurrentCmd'.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/drivers/staging/rtl8192e/r8192E_phy.c b/drivers/staging/rtl8192e/r8192E_phy.c
index 83e00d72199a..7ec6139cb4fb 100644
--- a/drivers/staging/rtl8192e/r8192E_phy.c
+++ b/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)