On 6/24/2015 7:27 AM, Dan Carpenter wrote: > We can't pass a NULL to input_unregister_device(). > > Fixes: 2a6cdbdd4cc0 ('HID: wacom: Introduce new 'touch_input' device') > Signed-off-by: Dan Carpenter <dan.carpenter@xxxxxxxxxx> > Looks reasonable to me. Reviewed-by: Jason Gerecke <jason.gerecke@xxxxxxxxx> -- Jason --- Now instead of four in the eights place / you’ve got three, ‘Cause you added one / (That is to say, eight) to the two, / But you can’t take seven from three, / So you look at the sixty-fours.... > diff --git a/drivers/hid/wacom_sys.c b/drivers/hid/wacom_sys.c > index 4c0ffca..44958d7 100644 > --- a/drivers/hid/wacom_sys.c > +++ b/drivers/hid/wacom_sys.c > @@ -1271,11 +1271,13 @@ fail_leds: > pad_input_dev = NULL; > wacom_wac->pad_registered = false; > fail_register_pad_input: > - input_unregister_device(touch_input_dev); > + if (touch_input_dev) > + input_unregister_device(touch_input_dev); > wacom_wac->touch_input = NULL; > wacom_wac->touch_registered = false; > fail_register_touch_input: > - input_unregister_device(pen_input_dev); > + if (pen_input_dev) > + input_unregister_device(pen_input_dev); > wacom_wac->pen_input = NULL; > wacom_wac->pen_registered = false; > fail_register_pen_input: > -- > 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 > -- To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html