[Bluetooth] Fix compile errors with enabled debugging

This patch fixes some stupid compile errors when debugging is enabled.

Noticed by Christian Hesse <mail@earthworm.de>

diff --git a/drivers/bluetooth/hci_bcsp.c b/drivers/bluetooth/hci_bcsp.c
index f5d2742a9f88deddffc8a2fed75b4119a4d504ae..60e01f517cd7628c208d0101472a895e96f794dd 100644 (file)
--- a/drivers/bluetooth/hci_bcsp.c
+++ b/drivers/bluetooth/hci_bcsp.c
@@ -512,7 +512,7 @@ static int bcsp_recv(struct hci_uart *hu, void *data, int count)
        struct bcsp_struct *bcsp = hu->priv;
        register unsigned char *ptr;
 
-       BT_DBG("hu %p count %d rx_state %ld rx_count %ld", 
+       BT_DBG("hu %p count %d rx_state %d rx_count %ld", 
                hu, count, bcsp->rx_state, bcsp->rx_count);
 
        ptr = data;

diff --git a/drivers/bluetooth/hci_usb.c b/drivers/bluetooth/hci_usb.c
index 988062080a3d2c9e7c6bc36a7bcf924b4c0a3032..7af168947bdcb4d41b1b76b7c6cc6279543c9f1f 100644 (file)
--- a/drivers/bluetooth/hci_usb.c
+++ b/drivers/bluetooth/hci_usb.c
@@ -55,7 +55,7 @@
 
 #include "hci_usb.h"
 
-#ifndef HCI_USB_DEBUG
+#ifndef CONFIG_BT_HCIUSB_DEBUG
 #undef  BT_DBG
 #define BT_DBG( A... )
 #undef  BT_DMP
@@ -795,7 +795,7 @@ int hci_usb_probe(struct usb_interface *intf, const struct usb_device_id *id)
        struct hci_dev *hdev;
        int i, a, e, size, ifn, isoc_ifnum, isoc_alts;
 
-       BT_DBG("udev %p ifnum %d", udev, ifnum);
+       BT_DBG("udev %p intf %p", udev, intf);
 
        if (!id->driver_info) {
                const struct usb_device_id *match;

diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index d7355f4a453749904500c27fe74baacfca301dd3..c515f28712c254dbccf48f737638510646a6d078 100644 (file)
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -222,7 +222,7 @@ static void hci_cc_host_ctl(struct hci_dev *hdev, __u16 ocf, struct sk_buff *skb
                vs = (struct hci_rp_read_voice_setting *) skb->data;
 
                if (vs->status) {
-                       BT_DBG("%s READ_VOICE_SETTING failed %d", hdev->name, vc->status);
+                       BT_DBG("%s READ_VOICE_SETTING failed %d", hdev->name, vs->status);
                        break;
                }
 
@@ -359,7 +359,7 @@ static inline void hci_cs_create_conn(struct hci_dev *hdev, __u8 status)
        conn = hci_conn_hash_lookup_ba(hdev, ACL_LINK, &cp->bdaddr);
 
        BT_DBG("%s status 0x%x bdaddr %s conn %p", hdev->name,
-                       status, batostr(&cc->bdaddr), conn);
+                       status, batostr(&cp->bdaddr), conn);
 
        if (status) {
                if (conn) {