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

Commit b50b9d3d authored by Jiri Kosina's avatar Jiri Kosina
Browse files

Merge branch 'for-4.15/sony' into for-linus 



- SHANWAN PS3 rumble fix from Bastien Nocera

Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parents ea3bbd0a 492ca83c

drivers/hid/hid-sony.c

+10 −4
Original line number Diff line number Diff line
@@ -1439,11 +1439,17 @@ static int sixaxis_set_operational_usb(struct hid_device *hdev) 
		goto out;

	}



	/*

	 * But the USB interrupt would cause SHANWAN controllers to

	 * start rumbling non-stop.

	 */

	if (strcmp(hdev->name, "SHANWAN PS3 GamePad")) {

		ret = hid_hw_output_report(hdev, buf, 1);

		if (ret < 0) {

			hid_info(hdev, "can't set operational mode: step 3, ignoring\n");

			ret = 0;

		}

	}



out:

	kfree(buf);