Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4599f772 authored Jul 20, 2016 by David S. Miller

Merge branch 'for-upstream' of...

Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next



Johan Hedberg says:

====================
pull request: bluetooth-next 2016-07-19

Here's likely the last bluetooth-next pull request for the 4.8 kernel:

 - Fix for L2CAP setsockopt
 - Fix for is_suspending flag handling in btmrvl driver
 - Addition of Bluetooth HW & FW info fields to debugfs
 - Fix to use int instead of char for callback status.

The last one (from Geert Uytterhoeven) is actually not purely a
Bluetooth (or 802.15.4) patch, but it was agreed with other maintainers
that we take it through the bluetooth-next tree.

Please let me know if there are any issues pulling. Thanks.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

parents b02b94b3 e7acf430

drivers/bluetooth/bpa10x.c

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -274,6 +274,8 @@ static int bpa10x_setup(struct hci_dev *hdev)

	BT_INFO("%s: %s", hdev->name, (char *)(skb->data + 1));		BT_INFO("%s: %s", hdev->name, (char *)(skb->data + 1));

			hci_set_fw_info(hdev, "%s", skb->data + 1);

	kfree_skb(skb);		kfree_skb(skb);
	return 0;		return 0;
	}		}

drivers/bluetooth/btmrvl_sdio.c

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1625,6 +1625,7 @@ static int btmrvl_sdio_suspend(struct device *dev)
	if (priv->adapter->hs_state != HS_ACTIVATED) {		if (priv->adapter->hs_state != HS_ACTIVATED) {
	if (btmrvl_enable_hs(priv)) {		if (btmrvl_enable_hs(priv)) {
	BT_ERR("HS not actived, suspend failed!");		BT_ERR("HS not actived, suspend failed!");
			priv->adapter->is_suspending = false;
	return -EBUSY;		return -EBUSY;
	}		}
	}		}

drivers/bluetooth/btwilink.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -51,7 +51,7 @@
	*/		*/
	struct ti_st {		struct ti_st {
	struct hci_dev *hdev;		struct hci_dev *hdev;
	char reg_status;		int reg_status;
	long (st_write) (struct sk_buff );		long (st_write) (struct sk_buff );
	struct completion wait_reg_completion;		struct completion wait_reg_completion;
	};		};
	@@ -83,7 +83,7 @@ static inline void ti_st_tx_complete(struct ti_st *hst, int pkt_type)
	* status.ti_st_open() function will wait for signal from this		* status.ti_st_open() function will wait for signal from this
	* API when st_register() function returns ST_PENDING.		* API when st_register() function returns ST_PENDING.
	*/		*/
	static void st_reg_completion_cb(void *priv_data, char data)		static void st_reg_completion_cb(void *priv_data, int data)
	{		{
	struct ti_st *lhst = priv_data;		struct ti_st *lhst = priv_data;

drivers/media/radio/wl128x/fmdrv_common.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1472,7 +1472,7 @@ static long fm_st_receive(void arg, struct sk_buff skb)
	* Called by ST layer to indicate protocol registration completion		* Called by ST layer to indicate protocol registration completion
	* status.		* status.
	*/		*/
	static void fm_st_reg_comp_cb(void *arg, char data)		static void fm_st_reg_comp_cb(void *arg, int data)
	{		{
	struct fmdev *fmdev;		struct fmdev *fmdev;

drivers/misc/ti-st/st_core.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -141,7 +141,7 @@ static void st_send_frame(unsigned char chnl_id, struct st_data_s *st_gdata)
	* This function is being called with spin lock held, protocol drivers are		* This function is being called with spin lock held, protocol drivers are
	* only expected to complete their waits and do nothing more than that.		* only expected to complete their waits and do nothing more than that.
	*/		*/
	static void st_reg_complete(struct st_data_s *st_gdata, char err)		static void st_reg_complete(struct st_data_s *st_gdata, int err)
	{		{
	unsigned char i = 0;		unsigned char i = 0;
	pr_info(" %s ", __func__);		pr_info(" %s ", __func__);