HID: wacom: check for wacom->shared before following the pointer

486b908 (HID: wacom: do not send pen events before touch is up/forced out)
introduces a kernel oops when plugging a tablet without touch.

wacom->shared is null for these devices so this leads to a null pointer
exception.

Change the condition to make it clear that what we need is wacom->shared
not NULL.

Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
This commit is contained in:
Benjamin Tissoires 2015-03-05 17:36:35 -05:00 committed by Jiri Kosina
parent 9b028649b9
commit e2c7d8877e

View File

@ -551,11 +551,12 @@ static int wacom_intuos_inout(struct wacom_wac *wacom)
(features->type == CINTIQ && !(data[1] & 0x40)))
return 1;
if (features->quirks & WACOM_QUIRK_MULTI_INPUT)
if (wacom->shared) {
wacom->shared->stylus_in_proximity = true;
if (wacom->shared->touch_down)
return 1;
if (wacom->shared->touch_down)
return 1;
}
/* in Range while exiting */
if (((data[1] & 0xfe) == 0x20) && wacom->reporting_data) {