diff options
| author | Pyun DoHyun <dh79.pyun@samsung.com> | 2018-06-01 00:29:53 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@review.ap-northeast-2.compute.internal> | 2018-06-01 00:29:53 +0000 |
| commit | b39b626df931d892732736afbe3285cf5a5d50af (patch) | |
| tree | 6c38a0b4d3a2ef2866acd641b078e18ac2ce913f | |
| parent | 012f67c8745ca3965b2fe9c125f8b8b3710fa3b3 (diff) | |
| parent | 90a106b063cc8d0321f6d81c07d8a3b01e95b138 (diff) | |
| download | bluez-b39b626df931d892732736afbe3285cf5a5d50af.tar.gz bluez-b39b626df931d892732736afbe3285cf5a5d50af.tar.bz2 bluez-b39b626df931d892732736afbe3285cf5a5d50af.zip | |
Merge "Fix LE device found event" into tizen
| -rw-r--r-- | src/adapter.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/src/adapter.c b/src/adapter.c index c54edc8d..e0bb7485 100644 --- a/src/adapter.c +++ b/src/adapter.c @@ -1180,9 +1180,6 @@ struct btd_device *btd_adapter_find_device(struct btd_adapter *adapter, struct device_addr_type addr; struct btd_device *device; GSList *list; -#ifdef TIZEN_FEATURE_BLUEZ_MODIFY - bool exact_match = false; -#endif if (!adapter) return NULL; @@ -1195,22 +1192,16 @@ struct btd_device *btd_adapter_find_device(struct btd_adapter *adapter, device_addr_type_strict_cmp); if (list) { device = list->data; - exact_match = true; + return device; } -#else +#endif list = g_slist_find_custom(adapter->devices, &addr, device_addr_type_cmp); -#endif if (!list) return NULL; device = list->data; -#ifdef TIZEN_FEATURE_BLUEZ_MODIFY - if (exact_match) - return device; -#endif - /* * If we're looking up based on public address and the address * was not previously used over this bearer we may need to |