X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=net%2Fbluetooth%2Fhci_sock.c;h=1506e1632394acf06e9f5873d045bd394e5b3059;hb=9b2c45d479d0fb8647c9e83359df69162b5fbe5f;hp=923e9a27187205e5ea6f07103a87b71e7c48e262;hpb=284af7a647990ee2b82b47fa1094e38f01450ff2;p=linux-2.6-block.git

diff --git a/net/bluetooth/hci_sock.c b/net/bluetooth/hci_sock.c
index 923e9a271872..1506e1632394 100644
--- a/net/bluetooth/hci_sock.c
+++ b/net/bluetooth/hci_sock.c
@@ -1340,7 +1340,7 @@ done:
 }
 
 static int hci_sock_getname(struct socket *sock, struct sockaddr *addr,
-			    int *addr_len, int peer)
+			    int peer)
 {
 	struct sockaddr_hci *haddr = (struct sockaddr_hci *)addr;
 	struct sock *sk = sock->sk;
@@ -1360,10 +1360,10 @@ static int hci_sock_getname(struct socket *sock, struct sockaddr *addr,
 		goto done;
 	}
 
-	*addr_len = sizeof(*haddr);
 	haddr->hci_family = AF_BLUETOOTH;
 	haddr->hci_dev    = hdev->id;
 	haddr->hci_channel= hci_pi(sk)->channel;
+	err = sizeof(*haddr);
 
 done:
 	release_sock(sk);