diff options
| author | Ricardo Mendoza <ricmm@gentoo.org> | 2011-07-13 16:04:29 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-11-11 09:36:39 -0800 |
| commit | 39361fcb63d49f4036af08473c503e006e063ddc (patch) | |
| tree | 9c9aedc21dbcc0504ab1a31755efee0fe65e0653 /drivers/bluetooth | |
| parent | efb1497bcc3a72b1617c6915bb62cf4dfa38c952 (diff) | |
| download | kernel_samsung_smdk4412-39361fcb63d49f4036af08473c503e006e063ddc.zip kernel_samsung_smdk4412-39361fcb63d49f4036af08473c503e006e063ddc.tar.gz kernel_samsung_smdk4412-39361fcb63d49f4036af08473c503e006e063ddc.tar.bz2 | |
Bluetooth: Add Toshiba laptops AR30XX device ID
commit 8e7c3d2e4ba18ee4cdcc1f89aec944fbff4ce735 upstream.
Blacklist Toshiba-branded AR3011 based AR5B195 [0930:0215] and add to
ath3k.c for firmware loading.
Signed-off-by: Ricardo Mendoza <ricmm@gentoo.org>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/bluetooth')
| -rw-r--r-- | drivers/bluetooth/ath3k.c | 1 | ||||
| -rw-r--r-- | drivers/bluetooth/btusb.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/drivers/bluetooth/ath3k.c b/drivers/bluetooth/ath3k.c index 6bacef3..1631fd0 100644 --- a/drivers/bluetooth/ath3k.c +++ b/drivers/bluetooth/ath3k.c @@ -63,6 +63,7 @@ static struct usb_device_id ath3k_table[] = { /* Atheros AR3011 with sflash firmware*/ { USB_DEVICE(0x0CF3, 0x3002) }, { USB_DEVICE(0x13d3, 0x3304) }, + { USB_DEVICE(0x0930, 0x0215) }, /* Atheros AR9285 Malbec with sflash firmware */ { USB_DEVICE(0x03F0, 0x311D) }, diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c index e5fa437..b8483ac 100644 --- a/drivers/bluetooth/btusb.c +++ b/drivers/bluetooth/btusb.c @@ -108,6 +108,7 @@ static struct usb_device_id blacklist_table[] = { /* Atheros 3011 with sflash firmware */ { USB_DEVICE(0x0cf3, 0x3002), .driver_info = BTUSB_IGNORE }, { USB_DEVICE(0x13d3, 0x3304), .driver_info = BTUSB_IGNORE }, + { USB_DEVICE(0x0930, 0x0215), .driver_info = BTUSB_IGNORE }, /* Atheros AR9285 Malbec with sflash firmware */ { USB_DEVICE(0x03f0, 0x311d), .driver_info = BTUSB_IGNORE }, |