From: Szymon Janc <szymon.janc@tieto.com>
Date: Mon, 21 Mar 2011 13:20:03 +0000 (+0100)
Subject: Bluetooth: Do not use assignments in IF conditions
X-Git-Tag: MMI-PSA29.97-13-9~19291^2~16^2~94^2~89
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=58aac468be411f2a9b4a28f2ed8e6e2a0db04267;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Bluetooth: Do not use assignments in IF conditions

Fix checkpatch warnings concerning assignments in if conditions.

Signed-off-by: Szymon Janc <szymon.janc@tieto.com>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
---

diff --git a/net/bluetooth/cmtp/core.c b/net/bluetooth/cmtp/core.c
index 964ea9126f9f..16aa6bd039ba 100644
--- a/net/bluetooth/cmtp/core.c
+++ b/net/bluetooth/cmtp/core.c
@@ -235,9 +235,12 @@ static void cmtp_process_transmit(struct cmtp_session *session)
 
 		size = min_t(uint, ((tail < 258) ? (tail - 2) : (tail - 3)), skb->len);
 
-		if ((scb->id < 0) && ((scb->id = cmtp_alloc_block_id(session)) < 0)) {
-			skb_queue_head(&session->transmit, skb);
-			break;
+		if (scb->id < 0) {
+			scb->id = cmtp_alloc_block_id(session);
+			if (scb->id < 0) {
+				skb_queue_head(&session->transmit, skb);
+				break;
+			}
 		}
 
 		if (size < 256) {