projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Wireless: nl80211, fix lock imbalance
[firefly-linux-kernel-4.4.55.git]
/
net
/
bluetooth
/
af_bluetooth.c
diff --git
a/net/bluetooth/af_bluetooth.c
b/net/bluetooth/af_bluetooth.c
index 02b9baa1930b86e641447e1247b6214616c59906..0250e0600150a464c8b3a1ecf8f56f7cff41f867 100644
(file)
--- a/
net/bluetooth/af_bluetooth.c
+++ b/
net/bluetooth/af_bluetooth.c
@@
-337,7
+337,7
@@
int bt_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
if (sk->sk_state == BT_LISTEN)
return -EINVAL;
- amount = sk->sk_sndbuf -
atomic_read(&sk->sk_wmem_alloc
);
+ amount = sk->sk_sndbuf -
sk_wmem_alloc_get(sk
);
if (amount < 0)
amount = 0;
err = put_user(amount, (int __user *) arg);