net: make getname() functions return length rather than use int* parameter

[linux-2.6-block.git] / net / bluetooth / hci_sock.c

diff --git a/net/bluetooth/hci_sock.c b/net/bluetooth/hci_sock.c
index 923e9a27187205e5ea6f07103a87b71e7c48e262..1506e1632394acf06e9f5873d045bd394e5b3059 100644 (file)
--- 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);