diff options
Diffstat (limited to 'drivers/bluetooth/bfusb.c')
-rw-r--r-- | drivers/bluetooth/bfusb.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/drivers/bluetooth/bfusb.c b/drivers/bluetooth/bfusb.c index 90a094634630..d3f14bee0f19 100644 --- a/drivers/bluetooth/bfusb.c +++ b/drivers/bluetooth/bfusb.c | |||
@@ -38,11 +38,6 @@ | |||
38 | #include <net/bluetooth/bluetooth.h> | 38 | #include <net/bluetooth/bluetooth.h> |
39 | #include <net/bluetooth/hci_core.h> | 39 | #include <net/bluetooth/hci_core.h> |
40 | 40 | ||
41 | #ifndef CONFIG_BT_HCIBFUSB_DEBUG | ||
42 | #undef BT_DBG | ||
43 | #define BT_DBG(D...) | ||
44 | #endif | ||
45 | |||
46 | #define VERSION "1.2" | 41 | #define VERSION "1.2" |
47 | 42 | ||
48 | static struct usb_driver bfusb_driver; | 43 | static struct usb_driver bfusb_driver; |
@@ -221,7 +216,7 @@ static int bfusb_rx_submit(struct bfusb_data *data, struct urb *urb) | |||
221 | struct sk_buff *skb; | 216 | struct sk_buff *skb; |
222 | int err, pipe, size = HCI_MAX_FRAME_SIZE + 32; | 217 | int err, pipe, size = HCI_MAX_FRAME_SIZE + 32; |
223 | 218 | ||
224 | BT_DBG("bfusb %p urb %p", bfusb, urb); | 219 | BT_DBG("bfusb %p urb %p", data, urb); |
225 | 220 | ||
226 | if (!urb && !(urb = usb_alloc_urb(0, GFP_ATOMIC))) | 221 | if (!urb && !(urb = usb_alloc_urb(0, GFP_ATOMIC))) |
227 | return -ENOMEM; | 222 | return -ENOMEM; |
@@ -354,7 +349,7 @@ static void bfusb_rx_complete(struct urb *urb) | |||
354 | int count = urb->actual_length; | 349 | int count = urb->actual_length; |
355 | int err, hdr, len; | 350 | int err, hdr, len; |
356 | 351 | ||
357 | BT_DBG("bfusb %p urb %p skb %p len %d", bfusb, urb, skb, skb->len); | 352 | BT_DBG("bfusb %p urb %p skb %p len %d", data, urb, skb, skb->len); |
358 | 353 | ||
359 | read_lock(&data->lock); | 354 | read_lock(&data->lock); |
360 | 355 | ||
@@ -691,7 +686,7 @@ static int bfusb_probe(struct usb_interface *intf, const struct usb_device_id *i | |||
691 | goto error; | 686 | goto error; |
692 | } | 687 | } |
693 | 688 | ||
694 | BT_DBG("firmware data %p size %d", firmware->data, firmware->size); | 689 | BT_DBG("firmware data %p size %zu", firmware->data, firmware->size); |
695 | 690 | ||
696 | if (bfusb_load_firmware(data, firmware->data, firmware->size) < 0) { | 691 | if (bfusb_load_firmware(data, firmware->data, firmware->size) < 0) { |
697 | BT_ERR("Firmware loading failed"); | 692 | BT_ERR("Firmware loading failed"); |