Commit e60e063c authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Dmitry Torokhov

HID: hid-gfrm: avoid warning for input_configured API change

The input_configured callback was recently changed to return
an 'int', but the newly added driver uses the old API:

drivers/hid/hid-gfrm.c:151:22: warning: initialization from incompatible pointer type [-Wincompatible-pointer-types]

This changes the driver like the other ones.
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Fixes: 34fc1322 ("HID: hid-gfrm: Google Fiber TV Box remote controls")
Fixes: b2c68a2f ("HID: hid-input: allow input_configured callback return errors")
Acked-by: default avatarPetri Gynther <pgynther@google.com>
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent 9154301a
...@@ -88,7 +88,7 @@ static int gfrm_raw_event(struct hid_device *hdev, struct hid_report *report, ...@@ -88,7 +88,7 @@ static int gfrm_raw_event(struct hid_device *hdev, struct hid_report *report,
return (ret < 0) ? ret : -1; return (ret < 0) ? ret : -1;
} }
static void gfrm_input_configured(struct hid_device *hid, struct hid_input *hidinput) static int gfrm_input_configured(struct hid_device *hid, struct hid_input *hidinput)
{ {
/* /*
* Enable software autorepeat with: * Enable software autorepeat with:
...@@ -96,6 +96,7 @@ static void gfrm_input_configured(struct hid_device *hid, struct hid_input *hidi ...@@ -96,6 +96,7 @@ static void gfrm_input_configured(struct hid_device *hid, struct hid_input *hidi
* - repeat period: 100 msec * - repeat period: 100 msec
*/ */
input_enable_softrepeat(hidinput->input, 400, 100); input_enable_softrepeat(hidinput->input, 400, 100);
return 0;
} }
static int gfrm_probe(struct hid_device *hdev, const struct hid_device_id *id) static int gfrm_probe(struct hid_device *hdev, const struct hid_device_id *id)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment