On Thu, 8 Oct 2015, Jason Gerecke wrote: > Adds support for the EMR (pen+pad) and touchscreen devices used by the > Wacom Cintiq Companion 2. This applies both to using the device as a > standalone system, as well as when operating in "Cintiq mode" (where > the EMR/touchscreen are simply exposed as USB devices to the system > its connected to). > > Signed-off-by: Jason Gerecke <jason.gerecke@xxxxxxxxx> > Signed-off-by: Clifford Jolly <expiredpopsicle@xxxxxxxxx> [ ... snip ... ] > @@ -2290,6 +2311,7 @@ void wacom_wac_irq(struct wacom_wac *wacom_wac, size_t len) > case WACOM_27QHD: > case DTK: > case CINTIQ_HYBRID: > + case CINTIQ_COMPANION_2: > sync = wacom_intuos_irq(wacom_wac); > break; This doesn't make any sense. You break here out after handling CINTIQ_COMPANION_2 in features->type switch ... > > @@ -2543,6 +2565,7 @@ int wacom_setup_pen_input_capabilities(struct input_dev *input_dev, > case CINTIQ: > case WACOM_13HD: > case CINTIQ_HYBRID: > + case CINTIQ_COMPANION_2: > input_set_abs_params(input_dev, ABS_Z, -900, 899, 0, 0); > input_abs_set_res(input_dev, ABS_Z, 287); > __set_bit(INPUT_PROP_DIRECT, input_dev->propbit); ... here you break out of the switch case a few lines below again. > @@ -2595,6 +2618,12 @@ int wacom_setup_pen_input_capabilities(struct input_dev *input_dev, > __clear_bit(ABS_MISC, input_dev->absbit); > /* fall through */ > > + case CINTIQ_COMPANION_2: > + for (i = 0; i < 10; i++) Where do you define this 'i'? > + __set_bit(BTN_0 + i, input_dev->keybit); > + __set_bit(BTN_A, input_dev->keybit); > + break; > + And here you break out of the same case again explicitly again. -- Jiri Kosina SUSE Labs -- To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
