[PATCH COMMITTED] bluetooth: hci: Fix type of "enable_hs" to bool.

[PATCH COMMITTED] bluetooth: hci: Fix type of "enable_hs" to bool.

[David Miller]

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>
---

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

Re: [PATCH COMMITTED] bluetooth: hci: Fix type of "enable_hs" to bool.

[Marcel Holtmann]

Hi Dave,

> 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>
> ---
> 
> I noticed this while validating the build today, committed to 'net'.

and from your subject, I assume you rightfully just applied that patch
to your tree.

I remember that I acked such a patch, but it seems it never made it
anywhere in the end :(

Regards

Marcel

Re: [PATCH COMMITTED] bluetooth: hci: Fix type of "enable_hs" to bool.

[David Miller]

From: Marcel Holtmann <marcel@holtmann.org>
Date: Mon, 23 Jan 2012 02:56:23 +0100

> Hi Dave,
> 
>> 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>
>> ---
>> 
>> I noticed this while validating the build today, committed to 'net'.
> 
> and from your subject, I assume you rightfully just applied that patch
> to your tree.

Right.

Re: [PATCH COMMITTED] bluetooth: hci: Fix type of "enable_hs" to bool.

[Johan Hedberg]

Hi Marcel,

On Mon, Jan 23, 2012, Marcel Holtmann wrote:
> Hi Dave,
> 
> > 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-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org>
> > ---
> > 
> > I noticed this while validating the build today, committed to 'net'.
> 
> and from your subject, I assume you rightfully just applied that patch
> to your tree.
> 
> I remember that I acked such a patch, but it seems it never made it
> anywhere in the end :(

It's over here:

http://git.kernel.org/?p=linux/kernel/git/jh/bluetooth-next.git;a=commitdiff;h=174b9000541fdffbdc53cf9464efb1c8a1d777db

Johan