git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'upstream/ticketlock-cleanup' of git://github.com/jsgf/linux-xen into...
[pandora-kernel.git]
/
net
/
bluetooth
/
hci_event.c
diff --git
a/net/bluetooth/hci_event.c
b/net/bluetooth/hci_event.c
index
a40170e
..
7ef4eb4
100644
(file)
--- a/
net/bluetooth/hci_event.c
+++ b/
net/bluetooth/hci_event.c
@@
-58,8
+58,8
@@
static void hci_cc_inquiry_cancel(struct hci_dev *hdev, struct sk_buff *skb)
if (status)
return;
if (status)
return;
- if (test_
bit(HCI_MGMT
, &hdev->flags) &&
-
test_and_clear_bit(HCI_INQUIRY
, &hdev->flags))
+ if (test_
and_clear_bit(HCI_INQUIRY
, &hdev->flags) &&
+
test_bit(HCI_MGMT
, &hdev->flags))
mgmt_discovering(hdev->id, 0);
hci_req_complete(hdev, HCI_OP_INQUIRY_CANCEL, status);
mgmt_discovering(hdev->id, 0);
hci_req_complete(hdev, HCI_OP_INQUIRY_CANCEL, status);
@@
-76,8
+76,8
@@
static void hci_cc_exit_periodic_inq(struct hci_dev *hdev, struct sk_buff *skb)
if (status)
return;
if (status)
return;
- if (test_
bit(HCI_MGMT
, &hdev->flags) &&
- test_
and_clear_bit(HCI_INQUIRY
, &hdev->flags))
+ if (test_
and_clear_bit(HCI_INQUIRY
, &hdev->flags) &&
+ test_
bit(HCI_MGMT
, &hdev->flags))
mgmt_discovering(hdev->id, 0);
hci_conn_check_pending(hdev);
mgmt_discovering(hdev->id, 0);
hci_conn_check_pending(hdev);
@@
-959,9
+959,8
@@
static inline void hci_cs_inquiry(struct hci_dev *hdev, __u8 status)
return;
}
return;
}
- if (test_bit(HCI_MGMT, &hdev->flags) &&
- !test_and_set_bit(HCI_INQUIRY,
- &hdev->flags))
+ if (!test_and_set_bit(HCI_INQUIRY, &hdev->flags) &&
+ test_bit(HCI_MGMT, &hdev->flags))
mgmt_discovering(hdev->id, 1);
}
mgmt_discovering(hdev->id, 1);
}
@@
-1340,8
+1339,8
@@
static inline void hci_inquiry_complete_evt(struct hci_dev *hdev, struct sk_buff
BT_DBG("%s status %d", hdev->name, status);
BT_DBG("%s status %d", hdev->name, status);
- if (test_
bit(HCI_MGMT
, &hdev->flags) &&
- test_
and_clear_bit(HCI_INQUIRY
, &hdev->flags))
+ if (test_
and_clear_bit(HCI_INQUIRY
, &hdev->flags) &&
+ test_
bit(HCI_MGMT
, &hdev->flags))
mgmt_discovering(hdev->id, 0);
hci_req_complete(hdev, HCI_OP_INQUIRY, status);
mgmt_discovering(hdev->id, 0);
hci_req_complete(hdev, HCI_OP_INQUIRY, status);