diff options
| author | Mark Brown <broonie@kernel.org> | 2016-02-10 18:26:26 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-02-10 18:26:26 +0000 |
| commit | b388b35a17d53dac58f2391795b823b7c5a54bac (patch) | |
| tree | a8db4b571297771e191489abeede06514fe94fd3 /drivers/hid/hid-ntrig.c | |
| parent | 6b4fe72f6c1ab93a893a8bc2e1155d34d7689440 (diff) | |
| parent | 17aa01a7059b202f893a9e7e859032640318b458 (diff) | |
Merge branch 'linaro-android-3.18-lsk' of git://android.git.linaro.org/kernel/linaro-android into linux-linaro-lsk-v3.18-androidlsk-v3.18-16.02-android
Diffstat (limited to 'drivers/hid/hid-ntrig.c')
| -rw-r--r-- | drivers/hid/hid-ntrig.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/hid/hid-ntrig.c b/drivers/hid/hid-ntrig.c index 600f2075512f..756d1ef9bd99 100644 --- a/drivers/hid/hid-ntrig.c +++ b/drivers/hid/hid-ntrig.c @@ -859,14 +859,14 @@ not_claimed_input: return 1; } -static void ntrig_input_configured(struct hid_device *hid, +static int ntrig_input_configured(struct hid_device *hid, struct hid_input *hidinput) { struct input_dev *input = hidinput->input; if (hidinput->report->maxfield < 1) - return; + return 0; switch (hidinput->report->field[0]->application) { case HID_DG_PEN: @@ -890,6 +890,8 @@ static void ntrig_input_configured(struct hid_device *hid, "N-Trig MultiTouch"; break; } + + return 0; } static int ntrig_probe(struct hid_device *hdev, const struct hid_device_id *id) |