summaryrefslogtreecommitdiff
path: root/net/bluetooth/l2cap_sock.c
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2011-06-10 15:05:34 -0400
committerJohn W. Linville <linville@tuxdriver.com>2011-06-10 15:05:34 -0400
commitd6124baf8a098aacdbb85ff5b171da68dad6930e (patch)
treee0b943d6e1bfbe1061995d3f3e16532b36775bc6 /net/bluetooth/l2cap_sock.c
parent51e65257142a87fe46a1ce5c35c86c5baf012614 (diff)
parent7f4f0572df6c8eaa6a587bc212b0806ff37380dd (diff)
downloadlinux-stable-d6124baf8a098aacdbb85ff5b171da68dad6930e.tar.gz
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/padovan/bluetooth-2.6
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 18dc9888d8c2..8248303f44e8 100644
--- a/net/bluetooth/l2cap_sock.c
+++ b/net/bluetooth/l2cap_sock.c
@@ -413,6 +413,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);