diff options
author | Dan Carpenter <dan.carpenter@oracle.com> | 2015-06-24 10:27:43 -0400 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2015-06-26 08:07:45 -0400 |
commit | 0fd72ff92d6bea32bba612744abbe6a0abd25e43 (patch) | |
tree | b72ae44db2ca1bfad59a1e968955cb66ae5096fd | |
parent | 67db8a8086e9b865533348954f5547f1e433101e (diff) |
HID: wacom: NULL dereferences on error in probe()
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@oracle.com>
Reviewed-by: Jason Gerecke <jason.gerecke@wacom.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
-rw-r--r-- | drivers/hid/wacom_sys.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/hid/wacom_sys.c b/drivers/hid/wacom_sys.c index 4c0ffca97bef..44958d79d598 100644 --- a/drivers/hid/wacom_sys.c +++ b/drivers/hid/wacom_sys.c | |||
@@ -1271,11 +1271,13 @@ fail_leds: | |||
1271 | pad_input_dev = NULL; | 1271 | pad_input_dev = NULL; |
1272 | wacom_wac->pad_registered = false; | 1272 | wacom_wac->pad_registered = false; |
1273 | fail_register_pad_input: | 1273 | fail_register_pad_input: |
1274 | input_unregister_device(touch_input_dev); | 1274 | if (touch_input_dev) |
1275 | input_unregister_device(touch_input_dev); | ||
1275 | wacom_wac->touch_input = NULL; | 1276 | wacom_wac->touch_input = NULL; |
1276 | wacom_wac->touch_registered = false; | 1277 | wacom_wac->touch_registered = false; |
1277 | fail_register_touch_input: | 1278 | fail_register_touch_input: |
1278 | input_unregister_device(pen_input_dev); | 1279 | if (pen_input_dev) |
1280 | input_unregister_device(pen_input_dev); | ||
1279 | wacom_wac->pen_input = NULL; | 1281 | wacom_wac->pen_input = NULL; |
1280 | wacom_wac->pen_registered = false; | 1282 | wacom_wac->pen_registered = false; |
1281 | fail_register_pen_input: | 1283 | fail_register_pen_input: |