aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorJohan Hedberg <johan.hedberg@intel.com>2015-11-27 11:11:52 +0200
committerMarcel Holtmann <marcel@holtmann.org>2015-12-10 00:51:49 +0100
commit550a8ca765a154ca38dcd888b4f12a173e761bdc (patch)
tree21abbea28865bf6aa8922bcd0bfdbf11030b5cae /net
parentBluetooth: Fix updating wrong instance's scan_rsp data (diff)
downloadlinux-dev-550a8ca765a154ca38dcd888b4f12a173e761bdc.tar.xz
linux-dev-550a8ca765a154ca38dcd888b4f12a173e761bdc.zip
Bluetooth: Remove redundant check for req.cmd_q
The hci_req_run() function already checks for empty cmd_q and bails out if necessary. Also, req.cmd_q should really be treated as private data of the request and not accessed directly. Signed-off-by: Johan Hedberg <johan.hedberg@intel.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net')
-rw-r--r--net/bluetooth/hci_request.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/net/bluetooth/hci_request.c b/net/bluetooth/hci_request.c
index edf2199de4ff..f1529d7740f6 100644
--- a/net/bluetooth/hci_request.c
+++ b/net/bluetooth/hci_request.c
@@ -1187,8 +1187,7 @@ static void adv_timeout_expire(struct work_struct *work)
if (list_empty(&hdev->adv_instances))
__hci_req_disable_advertising(&req);
- if (!skb_queue_empty(&req.cmd_q))
- hci_req_run(&req, NULL);
+ hci_req_run(&req, NULL);
unlock:
hci_dev_unlock(hdev);