summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorDavid Sterba <dsterba@suse.cz>2011-01-14 14:59:44 +0100
committerGustavo F. Padovan <padovan@profusion.mobi>2011-01-19 14:40:42 -0200
commit4571928fc73589e9c5217cd069d2c0b4ff1818a8 (patch)
tree6269ec7fd6734029956e528da626d21bf4b170cb /net
parent86e09287e4f8c81831b4d4118a48597565f0d21b (diff)
downloadlinux-stable-4571928fc73589e9c5217cd069d2c0b4ff1818a8.tar.gz
linux-stable-4571928fc73589e9c5217cd069d2c0b4ff1818a8.tar.bz2
linux-stable-4571928fc73589e9c5217cd069d2c0b4ff1818a8.zip
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>
Diffstat (limited to 'net')
-rw-r--r--net/bluetooth/l2cap.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/bluetooth/l2cap.c b/net/bluetooth/l2cap.c
index c791fcda7b2d..4fd88eb0a464 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;
}