diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-06-10 15:05:34 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-06-10 15:05:34 -0400 |
| commit | d6124baf8a098aacdbb85ff5b171da68dad6930e (patch) | |
| tree | e0b943d6e1bfbe1061995d3f3e16532b36775bc6 /net/bluetooth/rfcomm/sock.c | |
| parent | 51e65257142a87fe46a1ce5c35c86c5baf012614 (diff) | |
| parent | 7f4f0572df6c8eaa6a587bc212b0806ff37380dd (diff) | |
| download | op-kernel-dev-d6124baf8a098aacdbb85ff5b171da68dad6930e.zip op-kernel-dev-d6124baf8a098aacdbb85ff5b171da68dad6930e.tar.gz | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/padovan/bluetooth-2.6
Diffstat (limited to 'net/bluetooth/rfcomm/sock.c')
| -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 386cfaf..1b10727 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); |
