aboutsummaryrefslogtreecommitdiffstats
path: root/net/bluetooth/l2cap_sock.c
diff options
context:
space:
mode:
authorGustavo F. Padovan <padovan@profusion.mobi>2011-06-09 16:33:54 -0300
committerGustavo F. Padovan <padovan@profusion.mobi>2011-06-09 16:33:54 -0300
commit448f2627c169092d2091a1be22feb6a7775f6201 (patch)
tree8d12460ba978d4f031715ae4bd9e0bc6fee4c5ab /net/bluetooth/l2cap_sock.c
parent5a9d0a3ffbc40ea1f5a0636501e7599cbb327bcc (diff)
parent6de6c18d8d3b2a82cc1c657f005e61b1c1f2f886 (diff)
Merge master.kernel.org:/pub/scm/linux/kernel/git/padovan/bluetooth-2.6
Conflicts: net/bluetooth/rfcomm/sock.c
Diffstat (limited to 'net/bluetooth/l2cap_sock.c')
-rw-r--r--net/bluetooth/l2cap_sock.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c
index bec3e043b25..ab81894c667 100644
--- a/net/bluetooth/l2cap_sock.c
+++ b/net/bluetooth/l2cap_sock.c
@@ -367,6 +367,7 @@ static int l2cap_sock_getsockopt_old(struct socket *sock, int optname, char __us
break;
}
+ memset(&cinfo, 0, sizeof(cinfo));
cinfo.hci_handle = chan->conn->hcon->handle;
memcpy(cinfo.dev_class, chan->conn->hcon->dev_class, 3);