diff options
| author | Jiri Kosina <jkosina@suse.com> | 2015-07-17 09:19:37 (GMT) |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.com> | 2015-07-17 09:19:37 (GMT) |
| commit | 57f7e160a137f8ddae455f15abed9bdd1b90ab63 (patch) | |
| tree | 92993f2b4015a21bf645ba4d14e75dd73a624261 /drivers/hid/wacom_sys.c | |
| parent | 70caee0a3721956a98cb4bfbfa0eaa38c9182e44 (diff) | |
| parent | 3eb4351af42bd8b6de20daab07b204a85c35248f (diff) | |
| download | linux-57f7e160a137f8ddae455f15abed9bdd1b90ab63.tar.xz | |
Merge branch 'for-4.3/upstream' into for-4.3/wacom
There is a conflict between 67e123f ("Delete unnecessary checks") sitting
in for-4.3/upstream and memory allocation failure handling from Jason Gerecke.
Pull this so that conflict could be resolved.
Signed-off-by: Jiri Kosina <jkosina@suse.com>
Diffstat (limited to 'drivers/hid/wacom_sys.c')
| -rw-r--r-- | drivers/hid/wacom_sys.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/hid/wacom_sys.c b/drivers/hid/wacom_sys.c index 4c0ffca..936ad77 100644 --- a/drivers/hid/wacom_sys.c +++ b/drivers/hid/wacom_sys.c @@ -1149,12 +1149,9 @@ static void wacom_free_inputs(struct wacom *wacom) { struct wacom_wac *wacom_wac = &(wacom->wacom_wac); - if (wacom_wac->pen_input) - input_free_device(wacom_wac->pen_input); - if (wacom_wac->touch_input) - input_free_device(wacom_wac->touch_input); - if (wacom_wac->pad_input) - input_free_device(wacom_wac->pad_input); + input_free_device(wacom_wac->pen_input); + input_free_device(wacom_wac->touch_input); + input_free_device(wacom_wac->pad_input); wacom_wac->pen_input = NULL; wacom_wac->touch_input = NULL; wacom_wac->pad_input = NULL; |