Commit 8b281b9c authored Jan 10, 2012 by Fabio Estevam Committed by Johan Hedberg Feb 13, 2012

Bluetooth: Fix 'enable_hs' type



Fix the following build warning:

  CC [M]  net/bluetooth/hci_core.o
net/bluetooth/hci_core.c: In function ‘__check_enable_hs’:
net/bluetooth/hci_core.c:2587: warning: return from incompatible pointer type

module_param in hci_core.c passes 'enable_hs' as bool format, so fix
this variable definition type.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>

parent a3d4e20a

include/net/bluetooth/hci.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -1415,6 +1415,6 @@ struct hci_inquiry_req {
		};
		#define IREQ_CACHE_FLUSH 0x0001

		extern int enable_hs;
		extern bool enable_hs;

		#endif /* __HCI_H */

net/bluetooth/hci_core.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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);