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

- SHANWAN PS3 rumble fix from Bastien Nocera
Signed-off-by: Jiri Kosina <jkosina@suse.cz>

drivers/hid/hid-sony.c

@@ -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);