diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-06-17 12:40:36 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-06-17 12:40:36 -0400 |
| commit | 82362ccbf259b960192019deb562bf84549e3d1d (patch) | |
| tree | fee34ec77d908cd32907553eed0f10fb30061708 /net/bluetooth/rfcomm | |
| parent | 118133e6580a0c912cda86109b6468b5ffe73f1c (diff) | |
| parent | 3373b28e5af4a0b3c6cb39372581dcc1e41322ff (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into for-davem
Diffstat (limited to 'net/bluetooth/rfcomm')
| -rw-r--r-- | net/bluetooth/rfcomm/sock.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/bluetooth/rfcomm/sock.c b/net/bluetooth/rfcomm/sock.c index 386cfaffd4b..1b10727ce52 100644 --- a/net/bluetooth/rfcomm/sock.c +++ b/net/bluetooth/rfcomm/sock.c @@ -788,6 +788,7 @@ static int rfcomm_sock_getsockopt_old(struct socket *sock, int optname, char __u l2cap_sk = rfcomm_pi(sk)->dlc->session->sock->sk; + memset(&cinfo, 0, sizeof(cinfo)); cinfo.hci_handle = conn->hcon->handle; memcpy(cinfo.dev_class, conn->hcon->dev_class, 3); |