summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndre Guedes <andre.guedes@openbossa.org>2013-04-30 15:29:36 -0300
committerGustavo Padovan <gustavo.padovan@collabora.co.uk>2013-06-23 00:23:51 +0100
commit3fd319b830247a3fe5f489e622ab404b618e0906 (patch)
tree8f5c6f78348107f61e0522b8d92729979335052d
parent1183fdcad42495073045a2d9755e0a6ac2fa874e (diff)
downloadlinux-stable-3fd319b830247a3fe5f489e622ab404b618e0906.tar.gz
linux-stable-3fd319b830247a3fe5f489e622ab404b618e0906.tar.bz2
linux-stable-3fd319b830247a3fe5f489e622ab404b618e0906.zip
Bluetooth: Refactor hci_cc_le_set_scan_enable
This patch does a trivial refactoring in hci_cc_le_set_scan_enable. Since start and stop discovery command failures are now handled in mgmt layer, the status check became empty. So, we can move it to outside the switch statement. Signed-off-by: Andre Guedes <andre.guedes@openbossa.org> Acked-by: Johan Hedberg <johan.hedberg@intel.com> Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
-rw-r--r--net/bluetooth/hci_event.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index 27f66dc88c9b..76ff1af05693 100644
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -949,18 +949,15 @@ static void hci_cc_le_set_scan_enable(struct hci_dev *hdev,
if (!cp)
return;
+ if (status)
+ return;
+
switch (cp->enable) {
case LE_SCAN_ENABLE:
- if (status)
- return;
-
set_bit(HCI_LE_SCAN, &hdev->dev_flags);
break;
case LE_SCAN_DISABLE:
- if (status)
- return;
-
clear_bit(HCI_LE_SCAN, &hdev->dev_flags);
break;