diff options
| author | Amit Pundir <amit.pundir@linaro.org> | 2016-01-08 15:34:15 +0530 |
|---|---|---|
| committer | Amit Pundir <amit.pundir@linaro.org> | 2016-02-10 22:26:37 +0530 |
| commit | 17aa01a7059b202f893a9e7e859032640318b458 (patch) | |
| tree | 6f42672c659b7557204468ebbd3b2ed64b19964b | |
| parent | 416271766c791b201d47c7c1ec02643e16bd7141 (diff) | |
HID: hidpp: update input_configured callback
Update input_configured callback for hidpp (hidpp_input_configured)
to align with the changes from AOSP commit 7682bfa411f4
"UPSTREAM: HID: hid-input: allow input_configured callback return errors".
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
| -rw-r--r-- | drivers/hid/hid-logitech-hidpp.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/hid/hid-logitech-hidpp.c b/drivers/hid/hid-logitech-hidpp.c index 7dd9163f7e03..07bc1e66fb6d 100644 --- a/drivers/hid/hid-logitech-hidpp.c +++ b/drivers/hid/hid-logitech-hidpp.c @@ -652,13 +652,15 @@ static int hidpp_input_mapping(struct hid_device *hdev, struct hid_input *hi, return 0; } -static void hidpp_input_configured(struct hid_device *hdev, +static int hidpp_input_configured(struct hid_device *hdev, struct hid_input *hidinput) { struct hidpp_device *hidpp = hid_get_drvdata(hdev); if (hidpp->quirks & HIDPP_QUIRK_CLASS_WTP) wtp_input_configured(hdev, hidinput); + + return 0; } static int hidpp_raw_hidpp_event(struct hidpp_device *hidpp, u8 *data, |