These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / bluetooth / hci_ath.c

diff --git a/kernel/drivers/bluetooth/hci_ath.c b/kernel/drivers/bluetooth/hci_ath.c
index ec8fa0e..d776dfd 100644 (file)
--- a/kernel/drivers/bluetooth/hci_ath.c
+++ b/kernel/drivers/bluetooth/hci_ath.c
@@ -192,6 +192,7 @@ static int ath_recv(struct hci_uart *hu, const void *data, int count)
        if (IS_ERR(ath->rx_skb)) {
                int err = PTR_ERR(ath->rx_skb);
                BT_ERR("%s: Frame reassembly failed (%d)", hu->hdev->name, err);
+               ath->rx_skb = NULL;
                return err;
        }
 
@@ -242,6 +243,7 @@ static struct sk_buff *ath_dequeue(struct hci_uart *hu)
 static const struct hci_uart_proto athp = {
        .id             = HCI_UART_ATH3K,
        .name           = "ATH3K",
+       .manufacturer   = 69,
        .open           = ath_open,
        .close          = ath_close,
        .flush          = ath_flush,