From: David Sterba <dsterba@suse.cz>
Date: Fri, 14 Jan 2011 13:59:44 +0000 (+0100)
Subject: Bluetooth: l2cap: fix misuse of logical operation in place of bitop
X-Git-Tag: v2.6.38-rc3~29^2~4^2~14
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=4571928fc73589e9c5217cd069d2c0b4ff1818a8;p=~shefty%2Frdma-dev.git

Bluetooth: l2cap: fix misuse of logical operation in place of bitop

CC: Marcel Holtmann <marcel@holtmann.org>
CC: "Gustavo F. Padovan" <padovan@profusion.mobi>
CC: João Paulo Rechi Vita <jprvita@profusion.mobi>
Signed-off-by: David Sterba <dsterba@suse.cz>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
---

diff --git a/net/bluetooth/l2cap.c b/net/bluetooth/l2cap.c
index c791fcda7b2..4fd88eb0a46 100644
--- a/net/bluetooth/l2cap.c
+++ b/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;
 			}