Piteball/android_kernel_google_msm
1
0
Fork 0
mirror of https://github.com/followmsi/android_kernel_google_msm.git synced 2024-11-06 23:17:41 +00:00
Code Issues Projects Releases Wiki Activity

Bluetooth: Avoid race condition between hci registration/un-registration

Browse source 
Syncronized hci device registration/un-registration to avoid race
condition when called from mutiple paths/scenarios concurrently.

CRs-fixed: 375287
Change-Id: I920e7ade5b006b630ad8b02f953883a69b9677c7
Signed-off-by: Bhasker Neti <bneti@codeaurora.org>
This commit is contained in:
Bhasker Neti 2012-07-04 19:24:23 +05:30 committed by Stephen Boyd
parent 4e290d367c
commit 0f0dceed7f
1 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
drivers/bluetooth/hci_smd.c
View file

@ -42,6 +42,7 @@
*/
#define RX_Q_MONITOR (500) /* 500 milli second */
#define HCI_REGISTER_SET 0
static int hcismd_set;
@ -57,7 +58,7 @@ static void hci_dev_restart(struct work_struct *worker);
struct hci_smd_data {
struct hci_dev *hdev;
unsigned long flags;
struct smd_channel *event_channel;
struct smd_channel *data_channel;
struct wake_lock wake_lock_tx;
@ -403,11 +404,16 @@ static int hci_smd_hci_register_dev(struct hci_smd_data *hsmd)
struct hci_dev *hdev;
hdev = hsmd->hdev;
if (test_and_set_bit(HCI_REGISTER_SET, &hsmd->flags)) {
BT_ERR("HCI device registered already");
return 0;
} else
BT_INFO("HCI device registration is starting");
if (hci_register_dev(hdev) < 0) {
BT_ERR("Can't register HCI device");
hci_free_dev(hdev);
hsmd->hdev = NULL;
clear_bit(HCI_REGISTER_SET, &hsmd->flags);
return -ENODEV;
}
return 0;
@ -473,6 +479,11 @@ static void hci_smd_deregister_dev(struct hci_smd_data *hsmd)
{
tasklet_kill(&hs.rx_task);
if (!test_and_clear_bit(HCI_REGISTER_SET, &hsmd->flags)) {
BT_ERR("HCI device un-registered already");
return;
} else
BT_INFO("HCI device un-registration going on");
if (hsmd->hdev) {
if (hci_unregister_dev(hsmd->hdev) < 0)
BT_ERR("Can't unregister HCI device %s",