[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <20120122.144654.2252112633629547845.davem@davemloft.net>
Date: Sun, 22 Jan 2012 14:46:54 -0500 (EST)
From: David Miller <davem@...emloft.net>
To: netdev@...r.kernel.org
CC: linux-wireless@...r.kernel.org, linux-bluetooth@...r.kernel.org
Subject: [PATCH COMMITTED] bluetooth: hci: Fix type of "enable_hs" to bool.
Fixes:
net/bluetooth/hci_core.c: In function ‘__check_enable_hs’:
net/bluetooth/hci_core.c:2587:1: warning: return from incompatible pointer type [enabled by default]
Signed-off-by: David S. Miller <davem@...emloft.net>
---
I noticed this while validating the build today, committed to 'net'.
include/net/bluetooth/hci.h | 2 +-
net/bluetooth/hci_core.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h
index 5b2fed5..00596e8 100644
--- a/include/net/bluetooth/hci.h
+++ b/include/net/bluetooth/hci.h
@@ -1388,6 +1388,6 @@ struct hci_inquiry_req {
};
#define IREQ_CACHE_FLUSH 0x0001
-extern int enable_hs;
+extern bool enable_hs;
#endif /* __HCI_H */
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index 845da3e..9de9371 100644
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -55,7 +55,7 @@
#define AUTO_OFF_TIMEOUT 2000
-int enable_hs;
+bool enable_hs;
static void hci_rx_work(struct work_struct *work);
static void hci_cmd_work(struct work_struct *work);
--
1.7.7.5
Powered by blists - more mailing lists