diff options
| author | Jason Gerecke <killertofu@gmail.com> | 2015-08-03 10:17:04 -0700 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.com> | 2015-08-04 15:39:20 +0200 |
| commit | ccad85cc1ee34509840e5af80a436ceaf0b71edb (patch) | |
| tree | ec6870d5cc6fd515158075ff8141c3da208f13bc /drivers/hid/wacom_sys.c | |
| parent | 8dc8641e619228153ab0bc609f9f534126e87c08 (diff) | |
| download | blackbird-obmc-linux-ccad85cc1ee34509840e5af80a436ceaf0b71edb.tar.gz blackbird-obmc-linux-ccad85cc1ee34509840e5af80a436ceaf0b71edb.zip | |
HID: wacom: Replace WACOM_QUIRK_MONITOR with WACOM_DEVICETYPE_WL_MONITOR
The monitor interface on the wireless receiver is more logically expressed
as a type of device instead of a quirk.
Signed-off-by: Jason Gerecke <jason.gerecke@wacom.com>
Reviewed-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Signed-off-by: Jiri Kosina <jkosina@suse.com>
Diffstat (limited to 'drivers/hid/wacom_sys.c')
| -rw-r--r-- | drivers/hid/wacom_sys.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/hid/wacom_sys.c b/drivers/hid/wacom_sys.c index a334332fbb8f..13834bae227c 100644 --- a/drivers/hid/wacom_sys.c +++ b/drivers/hid/wacom_sys.c @@ -454,7 +454,7 @@ static void wacom_retrieve_hid_descriptor(struct hid_device *hdev, */ if (features->type == WIRELESS) { if (intf->cur_altsetting->desc.bInterfaceNumber == 0) { - features->device_type = WACOM_DEVICETYPE_NONE; + features->device_type = WACOM_DEVICETYPE_WL_MONITOR; } else if (intf->cur_altsetting->desc.bInterfaceNumber == 2) { features->device_type |= WACOM_DEVICETYPE_TOUCH; } @@ -1581,7 +1581,7 @@ static int wacom_probe(struct hid_device *hdev, if (error) goto fail_shared_data; - if (!(features->quirks & WACOM_QUIRK_MONITOR) && + if (!(features->device_type & WACOM_DEVICETYPE_WL_MONITOR) && (features->quirks & WACOM_QUIRK_BATTERY)) { error = wacom_initialize_battery(wacom); if (error) @@ -1615,7 +1615,7 @@ static int wacom_probe(struct hid_device *hdev, /* Note that if query fails it is not a hard failure */ wacom_query_tablet_data(hdev, features); - if (features->quirks & WACOM_QUIRK_MONITOR) + if (features->device_type & WACOM_DEVICETYPE_WL_MONITOR) error = hid_hw_open(hdev); if (wacom_wac->features.type == INTUOSHT && |
