aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/hid/hid-input.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/hid/hid-input.c')
-rw-r--r--drivers/hid/hid-input.c11
1 files changed, 1 insertions, 10 deletions
diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c
index 1d2d0827820c..0a68935c20b8 100644
--- a/drivers/hid/hid-input.c
+++ b/drivers/hid/hid-input.c
@@ -154,7 +154,7 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel
154{ 154{
155 struct input_dev *input = hidinput->input; 155 struct input_dev *input = hidinput->input;
156 struct hid_device *device = input_get_drvdata(input); 156 struct hid_device *device = input_get_drvdata(input);
157 int max = 0, code, ret; 157 int max = 0, code;
158 unsigned long *bit = NULL; 158 unsigned long *bit = NULL;
159 159
160 field->hidinput = hidinput; 160 field->hidinput = hidinput;
@@ -173,11 +173,6 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel
173 goto ignore; 173 goto ignore;
174 } 174 }
175 175
176 /* handle input mappings for quirky devices */
177 ret = hidinput_mapping_quirks(usage, hidinput, &bit, &max);
178 if (ret)
179 goto mapped;
180
181 if (device->driver->input_mapping) { 176 if (device->driver->input_mapping) {
182 int ret = device->driver->input_mapping(device, hidinput, field, 177 int ret = device->driver->input_mapping(device, hidinput, field,
183 usage, &bit, &max); 178 usage, &bit, &max);
@@ -590,10 +585,6 @@ void hidinput_hid_event(struct hid_device *hid, struct hid_field *field, struct
590 if (!usage->type) 585 if (!usage->type)
591 return; 586 return;
592 587
593 /* handle input events for quirky devices */
594 if (hidinput_event_quirks(hid, field, usage, value))
595 return;
596
597 if (usage->hat_min < usage->hat_max || usage->hat_dir) { 588 if (usage->hat_min < usage->hat_max || usage->hat_dir) {
598 int hat_dir = usage->hat_dir; 589 int hat_dir = usage->hat_dir;
599 if (!hat_dir) 590 if (!hat_dir)