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

Commit 65ab2fc4 authored by Jiri Kosina's avatar Jiri Kosina
Browse files

Merge branch 'for-3.15/sony' into for-3.15/hid-core-ll-transport-cleanup

parents 866e4797 dccf2f65

drivers/hid/Kconfig

+6 −4
Original line number Diff line number Diff line
@@ -617,25 +617,27 @@ config HID_SAMSUNG 
	Support for Samsung InfraRed remote control or keyboards.



config HID_SONY

	tristate "Sony PS2/3 accessories"

	tristate "Sony PS2/3/4 accessories"

	depends on USB_HID

	depends on NEW_LEDS

	depends on LEDS_CLASS

	select POWER_SUPPLY

	---help---

	Support for



	  * Sony PS3 6-axis controllers

	  * Sony PS4 DualShock 4 controllers

	  * Buzz controllers

	  * Sony PS3 Blue-ray Disk Remote Control (Bluetooth)

	  * Logitech Harmony adapter for Sony Playstation 3 (Bluetooth)



config SONY_FF

	bool "Sony PS2/3 accessories force feedback support"

	bool "Sony PS2/3/4 accessories force feedback support" 

	depends on HID_SONY

	select INPUT_FF_MEMLESS

	---help---

	Say Y here if you have a Sony PS2/3 accessory and want to enable force

	feedback support for it.

	Say Y here if you have a Sony PS2/3/4 accessory and want to enable

	force feedback support for it.



config HID_SPEEDLINK

	tristate "Speedlink VAD Cezanne mouse support"

drivers/hid/hid-sony.c

+692 −62

File changed.

Preview size limit exceeded, changes collapsed.

net/bluetooth/hidp/core.c

+3 −0
Original line number Diff line number Diff line
@@ -767,6 +767,9 @@ static int hidp_setup_hid(struct hidp_session *session, 
	snprintf(hid->phys, sizeof(hid->phys), "%pMR",

		 &l2cap_pi(session->ctrl_sock->sk)->chan->src);



	/* NOTE: Some device modules depend on the dst address being stored in

	 * uniq. Please be aware of this before making changes to this behavior.

	 */

	snprintf(hid->uniq, sizeof(hid->uniq), "%pMR",

		 &l2cap_pi(session->ctrl_sock->sk)->chan->dst);