diff options
| author | Matthew Xie <mattx@google.com> | 2011-10-31 21:23:21 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-10-31 21:23:21 +0000 |
| commit | 1aa35f90f295a2b601ca2a46104d9084c427c467 (patch) | |
| tree | 57c539323286b47eb1050dd5cfb942c74d184695 | |
| parent | b62b2052b674bbbaae0d7bc76474f7067cfd3806 (diff) | |
| parent | 62432dd0bb4d59f640bde9309f86eef2fd984f18 (diff) | |
| download | bluetooth-1aa35f90f295a2b601ca2a46104d9084c427c467.tar.gz | |
am 62432dd0: Check EALREADY status for HCIDEVUP command
* commit '62432dd0bb4d59f640bde9309f86eef2fd984f18':
Check EALREADY status for HCIDEVUP command
| -rw-r--r-- | bluedroid/bluetooth.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/bluedroid/bluetooth.c b/bluedroid/bluetooth.c index 252bdc4..4cc9204 100644 --- a/bluedroid/bluetooth.c +++ b/bluedroid/bluetooth.c @@ -168,11 +168,17 @@ int bt_enable() { if (hci_sock < 0) goto out; ret = ioctl(hci_sock, HCIDEVUP, HCI_DEV_ID); + + LOGI("bt_enable: ret: %d, errno: %d", ret, errno); if (!ret) { break; + } else if (errno == EALREADY) { + LOGW("Bluetoothd already started, unexpectedly!"); + break; } + close(hci_sock); - usleep(10000); // 10 ms retry delay + usleep(100000); // 100 ms retry delay } if (attempt == 0) { LOGE("%s: Timeout waiting for HCI device to come up, error- %d, ", |