korg/bluez
0
0
Fork 0
mirror of https://git.kernel.org/pub/scm/bluetooth/bluez.git synced 2024-11-26 05:34:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix initialization when adapter is already up

Browse Source 
When handling HCI_DEV_REG event it should not be necessary to generate a
HCI_DEV_UP since init_known_adapters already does it in case the adapter
is already up.
This commit is contained in:
Luiz Augusto von Dentz 2011-01-24 11:13:07 +02:00 committed by Johan Hedberg
parent 1e862b561c
commit 9ac53f53be
1 changed files with 2 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
plugins/hciops.c
View File

@ -2253,25 +2253,6 @@ fail:
exit(1);
}
static void device_devreg_setup(int index)
{
struct hci_dev_info di;
DBG("hci%d", index);
init_device(index);
memset(&di, 0, sizeof(di));
if (hci_devinfo(index, &di) < 0)
return;
if (ignore_device(&di))
return;
devs[index].already_up = hci_test_bit(HCI_UP, &di.flags);
}
static void init_conn_list(int index)
{
struct dev_info *dev = &devs[index];
@ -2318,11 +2299,7 @@ static void device_event(int event, int index)
switch (event) {
case HCI_DEV_REG:
info("HCI dev %d registered", index);
device_devreg_setup(index);
if (devs[index].already_up) {
init_conn_list(index);
device_event(HCI_DEV_UP, index);
}
init_device(index);
break;
case HCI_DEV_UNREG:
@ -2418,6 +2395,7 @@ static gboolean init_known_adapters(gpointer user_data)
if (!dev->already_up)
continue;
init_conn_list(dr->dev_id);
hciops_stop_inquiry(dr->dev_id);
dev->pending = 0;