From 7888132900b274ffca47f474f5c54a15c4c9a1f6 Mon Sep 17 00:00:00 2001
From: Mathias Krause <minipli@googlemail.com>
Date: Wed, 15 Aug 2012 11:31:47 +0000
Subject: [PATCH] --- yaml --- r: 322013 b: refs/heads/master c:
 3f68ba07b1da811bf383b4b701b129bfcb2e4988 h: refs/heads/master i:   322011:
 3d0a93d3961631d40585af86497a571a4505a78a v: v3

---
 [refs]                         | 2 +-
 trunk/net/bluetooth/hci_sock.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index ad9dbb0c24a5..567b0ca092cf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e15ca9a0ef9a86f0477530b0f44a725d67f889ee
+refs/heads/master: 3f68ba07b1da811bf383b4b701b129bfcb2e4988
diff --git a/trunk/net/bluetooth/hci_sock.c b/trunk/net/bluetooth/hci_sock.c
index a27bbc3cd4b7..19fdac78e555 100644
--- a/trunk/net/bluetooth/hci_sock.c
+++ b/trunk/net/bluetooth/hci_sock.c
@@ -694,6 +694,7 @@ static int hci_sock_getname(struct socket *sock, struct sockaddr *addr,
 	*addr_len = sizeof(*haddr);
 	haddr->hci_family = AF_BLUETOOTH;
 	haddr->hci_dev    = hdev->id;
+	haddr->hci_channel= 0;
 
 	release_sock(sk);
 	return 0;