Merge tag 'driver-core-4.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[firefly-linux-kernel-4.4.55.git] / drivers / bluetooth / hci_qca.c

diff --git a/drivers/bluetooth/hci_qca.c b/drivers/bluetooth/hci_qca.c
index 21f4ea4ce6103764c3282f9fda18dad8b1169709..71325e443e4631e732c457134cf99822f2610700 100644 (file)
--- a/drivers/bluetooth/hci_qca.c
+++ b/drivers/bluetooth/hci_qca.c
@@ -80,8 +80,8 @@ struct qca_data {
        spinlock_t hci_ibs_lock;        /* HCI_IBS state lock   */
        u8 tx_ibs_state;        /* HCI_IBS transmit side power state*/
        u8 rx_ibs_state;        /* HCI_IBS receive side power state */
-       u32 tx_vote;            /* Clock must be on for TX */
-       u32 rx_vote;            /* Clock must be on for RX */
+       bool tx_vote;           /* Clock must be on for TX */
+       bool rx_vote;           /* Clock must be on for RX */
        struct timer_list tx_idle_timer;
        u32 tx_idle_delay;
        struct timer_list wake_retrans_timer;
@@ -347,7 +347,7 @@ static void hci_ibs_wake_retrans_timeout(unsigned long arg)
        struct hci_uart *hu = (struct hci_uart *)arg;
        struct qca_data *qca = hu->priv;
        unsigned long flags, retrans_delay;
-       unsigned long retransmit = 0;
+       bool retransmit = false;
 
        BT_DBG("hu %p wake retransmit timeout in %d state",
                hu, qca->tx_ibs_state);
@@ -358,7 +358,7 @@ static void hci_ibs_wake_retrans_timeout(unsigned long arg)
        switch (qca->tx_ibs_state) {
        case HCI_IBS_TX_WAKING:
                /* No WAKE_ACK, retransmit WAKE */
-               retransmit = 1;
+               retransmit = true;
                if (send_hci_ibs_cmd(HCI_IBS_WAKE_IND, hu) < 0) {
                        BT_ERR("Failed to acknowledge device wake up");
                        break;
@@ -947,6 +947,7 @@ static int qca_setup(struct hci_uart *hu)
 static struct hci_uart_proto qca_proto = {
        .id             = HCI_UART_QCA,
        .name           = "QCA",
+       .manufacturer   = 29,
        .init_speed     = 115200,
        .oper_speed     = 3000000,
        .open           = qca_open,