wacom_sys.c (ac2423c975dbd3e8c2afc6dec53ee25be38f723b) wacom_sys.c (d2ec58aee8b1d68d309656a0561c81c12197a987)
1/*
2 * drivers/input/tablet/wacom_sys.c
3 *
4 * USB Wacom tablet support - system specific code
5 */
6
7/*
8 * This program is free software; you can redistribute it and/or modify

--- 2039 unchanged lines hidden (view full) ---

2048
2049 wacom->resources = false;
2050
2051 wacom->wacom_wac.pen_input = NULL;
2052 wacom->wacom_wac.touch_input = NULL;
2053 wacom->wacom_wac.pad_input = NULL;
2054}
2055
1/*
2 * drivers/input/tablet/wacom_sys.c
3 *
4 * USB Wacom tablet support - system specific code
5 */
6
7/*
8 * This program is free software; you can redistribute it and/or modify

--- 2039 unchanged lines hidden (view full) ---

2048
2049 wacom->resources = false;
2050
2051 wacom->wacom_wac.pen_input = NULL;
2052 wacom->wacom_wac.touch_input = NULL;
2053 wacom->wacom_wac.pad_input = NULL;
2054}
2055
2056static void wacom_set_shared_values(struct wacom_wac *wacom_wac)
2057{
2058 if (wacom_wac->features.device_type & WACOM_DEVICETYPE_TOUCH) {
2059 wacom_wac->shared->type = wacom_wac->features.type;
2060 wacom_wac->shared->touch_input = wacom_wac->touch_input;
2061 }
2062
2063 if (wacom_wac->has_mute_touch_switch)
2064 wacom_wac->shared->has_mute_touch_switch = true;
2065
2066 if (wacom_wac->shared->has_mute_touch_switch &&
2067 wacom_wac->shared->touch_input) {
2068 set_bit(EV_SW, wacom_wac->shared->touch_input->evbit);
2069 input_set_capability(wacom_wac->shared->touch_input, EV_SW,
2070 SW_MUTE_DEVICE);
2071 }
2072}
2073
2056static int wacom_parse_and_register(struct wacom *wacom, bool wireless)
2057{
2058 struct wacom_wac *wacom_wac = &wacom->wacom_wac;
2059 struct wacom_features *features = &wacom_wac->features;
2060 struct hid_device *hdev = wacom->hdev;
2061 int error;
2062 unsigned int connect_mask = HID_CONNECT_HIDRAW;
2063

--- 103 unchanged lines hidden (view full) ---

2167 (features->device_type & WACOM_DEVICETYPE_PAD))) {
2168 error = -ENODEV;
2169 goto fail_quirks;
2170 }
2171
2172 if (features->device_type & WACOM_DEVICETYPE_WL_MONITOR)
2173 error = hid_hw_open(hdev);
2174
2074static int wacom_parse_and_register(struct wacom *wacom, bool wireless)
2075{
2076 struct wacom_wac *wacom_wac = &wacom->wacom_wac;
2077 struct wacom_features *features = &wacom_wac->features;
2078 struct hid_device *hdev = wacom->hdev;
2079 int error;
2080 unsigned int connect_mask = HID_CONNECT_HIDRAW;
2081

--- 103 unchanged lines hidden (view full) ---

2185 (features->device_type & WACOM_DEVICETYPE_PAD))) {
2186 error = -ENODEV;
2187 goto fail_quirks;
2188 }
2189
2190 if (features->device_type & WACOM_DEVICETYPE_WL_MONITOR)
2191 error = hid_hw_open(hdev);
2192
2175 if ((wacom_wac->features.type == INTUOSHT ||
2176 wacom_wac->features.type == INTUOSHT2) &&
2177 (wacom_wac->features.device_type & WACOM_DEVICETYPE_TOUCH)) {
2178 wacom_wac->shared->type = wacom_wac->features.type;
2179 wacom_wac->shared->touch_input = wacom_wac->touch_input;
2180 }
2181
2193 wacom_set_shared_values(wacom_wac);
2182 devres_close_group(&hdev->dev, wacom);
2183
2184 return 0;
2185
2186fail_quirks:
2187 hid_hw_stop(hdev);
2188fail:
2189 wacom_release_resources(wacom);

--- 392 unchanged lines hidden --- 		2194 devres_close_group(&hdev->dev, wacom);
2195
2196 return 0;
2197
2198fail_quirks:
2199 hid_hw_stop(hdev);
2200fail:
2201 wacom_release_resources(wacom);

--- 392 unchanged lines hidden ---