diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2017-11-15 11:09:44 +0100 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2017-11-15 11:10:21 +0100 |
| commit | b50b9d3d21e0af1b8bda94d43c569593d45587af (patch) | |
| tree | d3bec514c3d5831136dc95353f13ba0d9f8792bf | |
| parent | ea3bbd0a2117d7291ae705caffbb99089315ec7b (diff) | |
| parent | 492ca83c3d19fba1622164f07cd7b775596a7db2 (diff) | |
| download | linux-b50b9d3d21e0af1b8bda94d43c569593d45587af.tar.bz2 | |
Merge branch 'for-4.15/sony' into for-linus
- SHANWAN PS3 rumble fix from Bastien Nocera
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
| -rw-r--r-- | drivers/hid/hid-sony.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/drivers/hid/hid-sony.c b/drivers/hid/hid-sony.c index d03203a82e8f..b9dc3ac4d4aa 100644 --- a/drivers/hid/hid-sony.c +++ b/drivers/hid/hid-sony.c @@ -1439,10 +1439,16 @@ static int sixaxis_set_operational_usb(struct hid_device *hdev) goto out; } - 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; + /* + * 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: |