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: Arnd Bergmann <arnd@arndb.de> Fixes:34fc1322e7
("HID: hid-gfrm: Google Fiber TV Box remote controls") Fixes:b2c68a2f1b
("HID: hid-input: allow input_configured callback return errors") Acked-by: Petri Gynther <pgynther@google.com> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
This commit is contained in:
Родитель
9154301a47
Коммит
e60e063c14
|
@ -88,7 +88,7 @@ static int gfrm_raw_event(struct hid_device *hdev, struct hid_report *report,
|
|||
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:
|
||||
|
@ -96,6 +96,7 @@ static void gfrm_input_configured(struct hid_device *hid, struct hid_input *hidi
|
|||
* - repeat period: 100 msec
|
||||
*/
|
||||
input_enable_softrepeat(hidinput->input, 400, 100);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int gfrm_probe(struct hid_device *hdev, const struct hid_device_id *id)
|
||||
|
|
Загрузка…
Ссылка в новой задаче