diff options
| author | Gustavo F. Padovan | 2011-06-09 21:33:54 +0200 |
|---|---|---|
| committer | Gustavo F. Padovan | 2011-06-09 21:33:54 +0200 |
| commit | 448f2627c169092d2091a1be22feb6a7775f6201 (patch) | |
| tree | 8d12460ba978d4f031715ae4bd9e0bc6fee4c5ab /net/bluetooth/rfcomm | |
| parent | Bluetooth: Clean up some code style issues (diff) | |
| parent | Bluetooth: Do not send SET_EVENT_MASK for 1.1 and earlier devices (diff) | |
| download | kernel-qcow2-linux-448f2627c169092d2091a1be22feb6a7775f6201.tar.gz kernel-qcow2-linux-448f2627c169092d2091a1be22feb6a7775f6201.tar.xz kernel-qcow2-linux-448f2627c169092d2091a1be22feb6a7775f6201.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/padovan/bluetooth-2.6
Conflicts:
net/bluetooth/rfcomm/sock.c
Diffstat (limited to 'net/bluetooth/rfcomm')
| -rw-r--r-- | net/bluetooth/rfcomm/sock.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/bluetooth/rfcomm/sock.c b/net/bluetooth/rfcomm/sock.c index bcf077cfd73e..8f01e6b11a70 100644 --- a/net/bluetooth/rfcomm/sock.c +++ b/net/bluetooth/rfcomm/sock.c @@ -679,7 +679,8 @@ static int rfcomm_sock_setsockopt(struct socket *sock, int level, int optname, c { struct sock *sk = sock->sk; struct bt_security sec; - int len, err = 0; + int err = 0; + size_t len; u32 opt; BT_DBG("sk %p", sk); @@ -785,6 +786,7 @@ static int rfcomm_sock_getsockopt_old(struct socket *sock, int optname, char __u break; } + memset(&cinfo, 0, sizeof(cinfo)); cinfo.hci_handle = conn->hcon->handle; memcpy(cinfo.dev_class, conn->hcon->dev_class, 3); |