Commit 6f46cf9b authored by Ping Cheng's avatar Ping Cheng Committed by Jiri Kosina

HID: wacom: generic: Send data only when the interface is defined

Sometime valid events may not be supported by the driver yet. Make
sure we don't process them when the code is not ready.

This fix prevents a kernel panic due to unsupported HID events.
Signed-off-by: default avatarPing Cheng <ping.cheng@wacom.com>
Reviewed-By: default avatarJason Gerecke <jason.gerecke@wacom.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 354a3298
...@@ -2109,11 +2109,11 @@ void wacom_wac_event(struct hid_device *hdev, struct hid_field *field, ...@@ -2109,11 +2109,11 @@ void wacom_wac_event(struct hid_device *hdev, struct hid_field *field,
if (wacom->wacom_wac.features.type != HID_GENERIC) if (wacom->wacom_wac.features.type != HID_GENERIC)
return; return;
if (WACOM_PAD_FIELD(field)) if (WACOM_PAD_FIELD(field) && wacom->wacom_wac.pad_input)
wacom_wac_pad_event(hdev, field, usage, value); wacom_wac_pad_event(hdev, field, usage, value);
else if (WACOM_PEN_FIELD(field)) else if (WACOM_PEN_FIELD(field) && wacom->wacom_wac.pen_input)
wacom_wac_pen_event(hdev, field, usage, value); wacom_wac_pen_event(hdev, field, usage, value);
else if (WACOM_FINGER_FIELD(field)) else if (WACOM_FINGER_FIELD(field) && wacom->wacom_wac.touch_input)
wacom_wac_finger_event(hdev, field, usage, value); wacom_wac_finger_event(hdev, field, usage, value);
} }
...@@ -2145,20 +2145,20 @@ void wacom_wac_report(struct hid_device *hdev, struct hid_report *report) ...@@ -2145,20 +2145,20 @@ void wacom_wac_report(struct hid_device *hdev, struct hid_report *report)
if (wacom_wac->features.type != HID_GENERIC) if (wacom_wac->features.type != HID_GENERIC)
return; return;
if (WACOM_PAD_FIELD(field)) if (WACOM_PAD_FIELD(field) && wacom->wacom_wac.pad_input)
wacom_wac_pad_pre_report(hdev, report); wacom_wac_pad_pre_report(hdev, report);
else if (WACOM_PEN_FIELD(field)) else if (WACOM_PEN_FIELD(field) && wacom->wacom_wac.pen_input)
wacom_wac_pen_pre_report(hdev, report); wacom_wac_pen_pre_report(hdev, report);
else if (WACOM_FINGER_FIELD(field)) else if (WACOM_FINGER_FIELD(field) && wacom->wacom_wac.touch_input)
wacom_wac_finger_pre_report(hdev, report); wacom_wac_finger_pre_report(hdev, report);
wacom_report_events(hdev, report); wacom_report_events(hdev, report);
if (WACOM_PAD_FIELD(field)) if (WACOM_PAD_FIELD(field) && wacom->wacom_wac.pad_input)
return wacom_wac_pad_report(hdev, report); return wacom_wac_pad_report(hdev, report);
else if (WACOM_PEN_FIELD(field)) else if (WACOM_PEN_FIELD(field) && wacom->wacom_wac.pen_input)
return wacom_wac_pen_report(hdev, report); return wacom_wac_pen_report(hdev, report);
else if (WACOM_FINGER_FIELD(field)) else if (WACOM_FINGER_FIELD(field) && wacom->wacom_wac.touch_input)
return wacom_wac_finger_report(hdev, report); return wacom_wac_finger_report(hdev, report);
} }
......
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