From: Jahnavi Meher <jahnavi.meher@gmail.com>
Date: Wed, 25 Jun 2014 10:18:15 +0000 (+0530)
Subject: rsi: Fixed warnings reported by static code analyzers.
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=d51193d4ae181df37e9196a54b1fe3360ca920f2;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

rsi: Fixed warnings reported by static code analyzers.

Fixed a warning related to incorrect return type and removed an
unnecessary semi colon.

Signed-off-by: Jahnavi Meher <jahnavi.meher@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
---

diff --git a/drivers/net/wireless/rsi/rsi_91x_core.c b/drivers/net/wireless/rsi/rsi_91x_core.c
index 1cd0914db270..f3d3995d8f6b 100644
--- a/drivers/net/wireless/rsi/rsi_91x_core.c
+++ b/drivers/net/wireless/rsi/rsi_91x_core.c
@@ -92,6 +92,7 @@ static u32 rsi_get_num_pkts_dequeue(struct rsi_common *common, u8 q_num)
 	struct sk_buff *skb;
 	u32 pkt_cnt = 0;
 	s16 txop = common->tx_qinfo[q_num].txop * 32;
+	__le16 r_txop;
 	struct ieee80211_rate rate;
 
 	rate.bitrate = RSI_RATE_MCS0 * 5 * 10; /* Convert to Kbps */
@@ -104,10 +105,11 @@ static u32 rsi_get_num_pkts_dequeue(struct rsi_common *common, u8 q_num)
 		return 0;
 
 	do {
-		txop -= ieee80211_generic_frame_duration(adapter->hw,
-							 adapter->vifs[0],
-							 common->band,
-							 skb->len, &rate);
+		r_txop = ieee80211_generic_frame_duration(adapter->hw,
+							  adapter->vifs[0],
+							  common->band,
+							  skb->len, &rate);
+		txop -= le16_to_cpu(r_txop);
 		pkt_cnt += 1;
 		/*checking if pkts are still there*/
 		if (skb_queue_len(&common->tx_queue[q_num]) - pkt_cnt)
@@ -191,7 +193,7 @@ get_queue_num:
 	if (q_num == VO_Q || q_num == VI_Q) {
 		common->pkt_cnt = rsi_get_num_pkts_dequeue(common, q_num);
 		common->pkt_cnt -= 1;
-	};
+	}
 
 	return q_num;
 }