From bfc307e8b977516479d8f07c6efe7dcb574d145d Mon Sep 17 00:00:00 2001
From: David Sterba <dsterba@suse.cz>
Date: Fri, 14 Jan 2011 14:59:44 +0100
Subject: [PATCH] --- yaml --- r: 232468 b: refs/heads/master c:
 4571928fc73589e9c5217cd069d2c0b4ff1818a8 h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/net/bluetooth/l2cap.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index d1fe9b423e35..57bb2d1c04ef 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 86e09287e4f8c81831b4d4118a48597565f0d21b
+refs/heads/master: 4571928fc73589e9c5217cd069d2c0b4ff1818a8
diff --git a/trunk/net/bluetooth/l2cap.c b/trunk/net/bluetooth/l2cap.c
index c791fcda7b2d..4fd88eb0a464 100644
--- a/trunk/net/bluetooth/l2cap.c
+++ b/trunk/net/bluetooth/l2cap.c
@@ -1893,8 +1893,8 @@ static int l2cap_sock_sendmsg(struct kiocb *iocb, struct socket *sock, struct ms
 		if (pi->mode == L2CAP_MODE_STREAMING) {
 			l2cap_streaming_send(sk);
 		} else {
-			if (pi->conn_state & L2CAP_CONN_REMOTE_BUSY &&
-					pi->conn_state && L2CAP_CONN_WAIT_F) {
+			if ((pi->conn_state & L2CAP_CONN_REMOTE_BUSY) &&
+					(pi->conn_state & L2CAP_CONN_WAIT_F)) {
 				err = len;
 				break;
 			}