diff options
| author | David S. Miller <davem@davemloft.net> | 2012-01-22 20:45:14 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-01-22 21:08:46 +0100 |
| commit | b1cc16b8e643096adb92bbcb76c6c4c564141c40 (patch) | |
| tree | c82c5be4c43ab5c82cf9fad022a4c77df30e90cc | |
| parent | net: introduce res_counter_charge_nofail() for socket allocations (diff) | |
| download | linux-b1cc16b8e643096adb92bbcb76c6c4c564141c40.tar.xz linux-b1cc16b8e643096adb92bbcb76c6c4c564141c40.zip | |
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@davemloft.net>
| -rw-r--r-- | include/net/bluetooth/hci.h | 2 | ||||
| -rw-r--r-- | 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 5b2fed5eebf2..00596e816b4d 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 845da3ee56a0..9de93714213a 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); |