Merge tag 'for-linus-20160523' of git://git.infradead.org/linux-mtd

[linux-2.6-block.git] / drivers / bluetooth / ath3k.c

diff --git a/drivers/bluetooth/ath3k.c b/drivers/bluetooth/ath3k.c
index 47ca4b39d3065658c04d6b95add0b648da617a07..25894687c168048414050bdfb8229935e083ec62 100644 (file)
--- a/drivers/bluetooth/ath3k.c
+++ b/drivers/bluetooth/ath3k.c
@@ -122,6 +122,7 @@ static const struct usb_device_id ath3k_table[] = {
        { USB_DEVICE(0x13d3, 0x3432) },
        { USB_DEVICE(0x13d3, 0x3472) },
        { USB_DEVICE(0x13d3, 0x3474) },
+       { USB_DEVICE(0x13d3, 0x3487) },
 
        /* Atheros AR5BBU12 with sflash firmware */
        { USB_DEVICE(0x0489, 0xE02C) },
@@ -188,6 +189,7 @@ static const struct usb_device_id ath3k_blist_tbl[] = {
        { USB_DEVICE(0x13d3, 0x3432), .driver_info = BTUSB_ATH3012 },
        { USB_DEVICE(0x13d3, 0x3472), .driver_info = BTUSB_ATH3012 },
        { USB_DEVICE(0x13d3, 0x3474), .driver_info = BTUSB_ATH3012 },
+       { USB_DEVICE(0x13d3, 0x3487), .driver_info = BTUSB_ATH3012 },
 
        /* Atheros AR5BBU22 with sflash firmware */
        { USB_DEVICE(0x0489, 0xE036), .driver_info = BTUSB_ATH3012 },
@@ -206,7 +208,8 @@ static int ath3k_load_firmware(struct usb_device *udev,
                                const struct firmware *firmware)
 {
        u8 *send_buf;
-       int err, pipe, len, size, sent = 0;
+       int len = 0;
+       int err, pipe, size, sent = 0;
        int count = firmware->size;
 
        BT_DBG("udev %p", udev);
@@ -302,7 +305,8 @@ static int ath3k_load_fwfile(struct usb_device *udev,
                const struct firmware *firmware)
 {
        u8 *send_buf;
-       int err, pipe, len, size, count, sent = 0;
+       int len = 0;
+       int err, pipe, size, count, sent = 0;
        int ret;
 
        count = firmware->size;