diff options
author | Andrei Emeltchenko <andrei.emeltchenko@nokia.com> | 2010-12-01 09:58:23 -0500 |
---|---|---|
committer | Gustavo F. Padovan <padovan@profusion.mobi> | 2010-12-01 18:04:43 -0500 |
commit | 285b4e90318dcf421a00b2ac3fe8ab713f3281e3 (patch) | |
tree | 2f69b35603f0c68288e364cc41de96e502ee511b /net/bluetooth/rfcomm/sock.c | |
parent | 735cbc4784a084b7a76c43c69f9dba683bb3b48b (diff) |
Bluetooth: clean up rfcomm code
Remove extra spaces, assignments in if statement, zeroing static
variables, extra braces. Fix includes.
Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@nokia.com>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
Diffstat (limited to 'net/bluetooth/rfcomm/sock.c')
-rw-r--r-- | net/bluetooth/rfcomm/sock.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/bluetooth/rfcomm/sock.c b/net/bluetooth/rfcomm/sock.c index 0207bd6dbfc5..66cc1f0c3df8 100644 --- a/net/bluetooth/rfcomm/sock.c +++ b/net/bluetooth/rfcomm/sock.c | |||
@@ -45,7 +45,7 @@ | |||
45 | #include <net/sock.h> | 45 | #include <net/sock.h> |
46 | 46 | ||
47 | #include <asm/system.h> | 47 | #include <asm/system.h> |
48 | #include <asm/uaccess.h> | 48 | #include <linux/uaccess.h> |
49 | 49 | ||
50 | #include <net/bluetooth/bluetooth.h> | 50 | #include <net/bluetooth/bluetooth.h> |
51 | #include <net/bluetooth/hci_core.h> | 51 | #include <net/bluetooth/hci_core.h> |
@@ -888,7 +888,8 @@ static int rfcomm_sock_shutdown(struct socket *sock, int how) | |||
888 | 888 | ||
889 | BT_DBG("sock %p, sk %p", sock, sk); | 889 | BT_DBG("sock %p, sk %p", sock, sk); |
890 | 890 | ||
891 | if (!sk) return 0; | 891 | if (!sk) |
892 | return 0; | ||
892 | 893 | ||
893 | lock_sock(sk); | 894 | lock_sock(sk); |
894 | if (!sk->sk_shutdown) { | 895 | if (!sk->sk_shutdown) { |