diff options
Diffstat (limited to 'drivers/bluetooth')
-rw-r--r-- | drivers/bluetooth/bpa10x.c | 4 | ||||
-rw-r--r-- | drivers/bluetooth/hci_usb.c | 7 |
2 files changed, 9 insertions, 2 deletions
diff --git a/drivers/bluetooth/bpa10x.c b/drivers/bluetooth/bpa10x.c index ecbeb7eaba8e..394796315adc 100644 --- a/drivers/bluetooth/bpa10x.c +++ b/drivers/bluetooth/bpa10x.c | |||
@@ -84,8 +84,8 @@ struct bpa10x_data { | |||
84 | 84 | ||
85 | struct hci_vendor_hdr { | 85 | struct hci_vendor_hdr { |
86 | __u8 type; | 86 | __u8 type; |
87 | __u16 snum; | 87 | __le16 snum; |
88 | __u16 dlen; | 88 | __le16 dlen; |
89 | } __attribute__ ((packed)); | 89 | } __attribute__ ((packed)); |
90 | 90 | ||
91 | static void bpa10x_recv_bulk(struct bpa10x_data *data, unsigned char *buf, int count) | 91 | static void bpa10x_recv_bulk(struct bpa10x_data *data, unsigned char *buf, int count) |
diff --git a/drivers/bluetooth/hci_usb.c b/drivers/bluetooth/hci_usb.c index f510b25b2c59..057cb2b6e6d1 100644 --- a/drivers/bluetooth/hci_usb.c +++ b/drivers/bluetooth/hci_usb.c | |||
@@ -65,6 +65,7 @@ | |||
65 | #endif | 65 | #endif |
66 | 66 | ||
67 | static int ignore = 0; | 67 | static int ignore = 0; |
68 | static int ignore_dga = 0; | ||
68 | static int ignore_csr = 0; | 69 | static int ignore_csr = 0; |
69 | static int ignore_sniffer = 0; | 70 | static int ignore_sniffer = 0; |
70 | static int reset = 0; | 71 | static int reset = 0; |
@@ -841,6 +842,9 @@ static int hci_usb_probe(struct usb_interface *intf, const struct usb_device_id | |||
841 | if (ignore || id->driver_info & HCI_IGNORE) | 842 | if (ignore || id->driver_info & HCI_IGNORE) |
842 | return -ENODEV; | 843 | return -ENODEV; |
843 | 844 | ||
845 | if (ignore_dga && id->driver_info & HCI_DIGIANSWER) | ||
846 | return -ENODEV; | ||
847 | |||
844 | if (ignore_csr && id->driver_info & HCI_CSR) | 848 | if (ignore_csr && id->driver_info & HCI_CSR) |
845 | return -ENODEV; | 849 | return -ENODEV; |
846 | 850 | ||
@@ -1070,6 +1074,9 @@ module_exit(hci_usb_exit); | |||
1070 | module_param(ignore, bool, 0644); | 1074 | module_param(ignore, bool, 0644); |
1071 | MODULE_PARM_DESC(ignore, "Ignore devices from the matching table"); | 1075 | MODULE_PARM_DESC(ignore, "Ignore devices from the matching table"); |
1072 | 1076 | ||
1077 | module_param(ignore_dga, bool, 0644); | ||
1078 | MODULE_PARM_DESC(ignore_dga, "Ignore devices with id 08fd:0001"); | ||
1079 | |||
1073 | module_param(ignore_csr, bool, 0644); | 1080 | module_param(ignore_csr, bool, 0644); |
1074 | MODULE_PARM_DESC(ignore_csr, "Ignore devices with id 0a12:0001"); | 1081 | MODULE_PARM_DESC(ignore_csr, "Ignore devices with id 0a12:0001"); |
1075 | 1082 | ||