You've already forked linux-apfs
mirror of
https://github.com/linux-apfs/linux-apfs.git
synced 2026-05-01 15:00:59 -07:00
Merge branch 'for-4.15/sony' into for-linus
- SHANWAN PS3 rumble fix from Bastien Nocera Signed-off-by: Jiri Kosina <jkosina@suse.cz>
This commit is contained in:
+10
-4
@@ -1439,10 +1439,16 @@ static int sixaxis_set_operational_usb(struct hid_device *hdev)
|
|||||||
goto out;
|
goto out;
|
||||||
}
|
}
|
||||||
|
|
||||||
ret = hid_hw_output_report(hdev, buf, 1);
|
/*
|
||||||
if (ret < 0) {
|
* But the USB interrupt would cause SHANWAN controllers to
|
||||||
hid_info(hdev, "can't set operational mode: step 3, ignoring\n");
|
* start rumbling non-stop.
|
||||||
ret = 0;
|
*/
|
||||||
|
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:
|
out:
|
||||||
|
|||||||
Reference in New Issue
Block a user