diff --git a/[refs] b/[refs] index 480a71ec35a1..277c158d0468 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9f2aee848fe60325b1984653833d2d1825ec730d +refs/heads/master: cd1b44255c498d122220f5280c6cdbf7749c764b diff --git a/trunk/drivers/bluetooth/hci_h5.c b/trunk/drivers/bluetooth/hci_h5.c index 022a6bcb4323..3c0e17b4602d 100644 --- a/trunk/drivers/bluetooth/hci_h5.c +++ b/trunk/drivers/bluetooth/hci_h5.c @@ -138,6 +138,8 @@ static int h5_open(struct hci_uart *hu) h5->timer.function = h5_timed_event; h5->timer.data = (unsigned long) hu; + set_bit(HCI_UART_INIT_PENDING, &hu->hdev_flags); + /* Send initial sync request */ h5_link_control(hu, sync, sizeof(sync)); mod_timer(&h5->timer, jiffies + H5_SYNC_TIMEOUT); @@ -229,6 +231,7 @@ static void h5_handle_internal_rx(struct hci_uart *hu) h5_link_control(hu, conf_req, 3); } else if (memcmp(data, conf_rsp, 2) == 0) { BT_DBG("Three-wire init sequence complete"); + hci_uart_init_ready(hu); return; } else { BT_DBG("Link Control: 0x%02hhx 0x%02hhx", data[0], data[1]);