diff options
author | Alex Shi <alex.shi@linaro.org> | 2016-08-18 12:33:31 +0800 |
---|---|---|
committer | Alex Shi <alex.shi@linaro.org> | 2016-08-18 12:33:31 +0800 |
commit | fdd85431d91c9da37e9e696eb8fe80f1a2dcdbeb (patch) | |
tree | ac60b28ebed345df274ce42aa3c9f3ee091875d1 /drivers/hid | |
parent | e01035c1a71d7cceebc3df92f79577df7438523a (diff) | |
parent | e779279da78339ec75fa72571ef901a447762cc6 (diff) |
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
Diffstat (limited to 'drivers/hid')
-rw-r--r-- | drivers/hid/hid-sony.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/hid/hid-sony.c b/drivers/hid/hid-sony.c index 774cd2210566..21febbb0d84e 100644 --- a/drivers/hid/hid-sony.c +++ b/drivers/hid/hid-sony.c @@ -1418,8 +1418,10 @@ static int sixaxis_set_operational_usb(struct hid_device *hdev) } ret = hid_hw_output_report(hdev, buf, 1); - if (ret < 0) - hid_err(hdev, "can't set operational mode: step 3\n"); + if (ret < 0) { + hid_info(hdev, "can't set operational mode: step 3, ignoring\n"); + ret = 0; + } out: kfree(buf); |