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

Commit 08e6d907 authored by Gustavo Padovan's avatar Gustavo Padovan
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth

parents d34c34fb 671267bf

drivers/net/wireless/rtlwifi/pci.c

+8 −8
Original line number Diff line number Diff line
@@ -1853,14 +1853,6 @@ int __devinit rtl_pci_probe(struct pci_dev *pdev, 
	/*like read eeprom and so on */

	rtlpriv->cfg->ops->read_eeprom_info(hw);



	if (rtlpriv->cfg->ops->init_sw_vars(hw)) {

		RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "Can't init_sw_vars\n");

		err = -ENODEV;

		goto fail3;

	}



	rtlpriv->cfg->ops->init_sw_leds(hw);



	/*aspm */

	rtl_pci_init_aspm(hw);
@@ -1879,6 +1871,14 @@ int __devinit rtl_pci_probe(struct pci_dev *pdev, 
		goto fail3;

	}



	if (rtlpriv->cfg->ops->init_sw_vars(hw)) {

		RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "Can't init_sw_vars\n");

		err = -ENODEV;

		goto fail3;

	}



	rtlpriv->cfg->ops->init_sw_leds(hw);



	err = sysfs_create_group(&pdev->dev.kobj, &rtl_attribute_group);

	if (err) {

		RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,

drivers/net/wireless/rtlwifi/usb.c

+5 −5
Original line number Diff line number Diff line
@@ -971,11 +971,6 @@ int __devinit rtl_usb_probe(struct usb_interface *intf, 
	rtlpriv->cfg->ops->read_chip_version(hw);

	/*like read eeprom and so on */

	rtlpriv->cfg->ops->read_eeprom_info(hw);

	if (rtlpriv->cfg->ops->init_sw_vars(hw)) {

		RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "Can't init_sw_vars\n");

		goto error_out;

	}

	rtlpriv->cfg->ops->init_sw_leds(hw);

	err = _rtl_usb_init(hw);

	if (err)

		goto error_out;
@@ -987,6 +982,11 @@ int __devinit rtl_usb_probe(struct usb_interface *intf, 
			 "Can't allocate sw for mac80211\n");

		goto error_out;

	}

	if (rtlpriv->cfg->ops->init_sw_vars(hw)) {

		RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "Can't init_sw_vars\n");

		goto error_out;

	}

	rtlpriv->cfg->ops->init_sw_leds(hw);



	return 0;

error_out:

include/net/bluetooth/bluetooth.h

+1 −0
Original line number Diff line number Diff line
@@ -195,6 +195,7 @@ struct bt_sock { 
	struct list_head accept_q;

	struct sock *parent;

	u32 defer_setup;

	bool suspended;

};



struct bt_sock_list {

net/bluetooth/af_bluetooth.c

+1 −1
Original line number Diff line number Diff line
@@ -450,7 +450,7 @@ unsigned int bt_sock_poll(struct file *file, struct socket *sock, poll_table *wa 
			sk->sk_state == BT_CONFIG)

		return mask;



	if (sock_writeable(sk))

	if (!bt_sk(sk)->suspended && sock_writeable(sk))

		mask |= POLLOUT | POLLWRNORM | POLLWRBAND;

	else

		set_bit(SOCK_ASYNC_NOSPACE, &sk->sk_socket->flags);

net/bluetooth/hci_core.c

+8 −0
Original line number Diff line number Diff line
@@ -2715,6 +2715,14 @@ static inline void hci_acldata_packet(struct hci_dev *hdev, struct sk_buff *skb) 
	if (conn) {

		hci_conn_enter_active_mode(conn, BT_POWER_FORCE_ACTIVE_OFF);



		hci_dev_lock(hdev);

		if (test_bit(HCI_MGMT, &hdev->dev_flags) &&

		    !test_and_set_bit(HCI_CONN_MGMT_CONNECTED, &conn->flags))

			mgmt_device_connected(hdev, &conn->dst, conn->type,

					      conn->dst_type, 0, NULL, 0,

					      conn->dev_class);

		hci_dev_unlock(hdev);



		/* Send to upper protocol */

		l2cap_recv_acldata(conn, skb, flags);

		return;