diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-08-26 22:22:51 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-08-26 22:22:50 -0700 |
| commit | 9a7c65cabed11146b6522bcf13574eb061e58a64 (patch) | |
| tree | 34b4edcf97c32e855dae05f9c4154b134771b3e1 /include/linux | |
| parent | f6b34d14bd1cae77540cb285f83c92324c101d2d (diff) | |
| parent | 29e0ce3c544d39b5f438a79f7949b55c59aeaece (diff) | |
Merge "input: synaptics_dsx_2.6: fix issues raised by static analyzer"
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/input/synaptics_dsx_v2_6.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/input/synaptics_dsx_v2_6.h b/include/linux/input/synaptics_dsx_v2_6.h index 2b91bc043f6f..5d4bbedb5f1a 100644 --- a/include/linux/input/synaptics_dsx_v2_6.h +++ b/include/linux/input/synaptics_dsx_v2_6.h @@ -5,6 +5,7 @@ * * Copyright (C) 2012 Alexandra Chin <alexandra.chin@tw.synaptics.com> * Copyright (C) 2012 Scott Lin <scott.lin@tw.synaptics.com> + * Copyright (C) 2016, The Linux Foundation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -57,6 +58,7 @@ struct synaptics_dsx_button_map { * @x_flip: x flip flag * @y_flip: y flip flag * @swap_axes: swap axes flag + * @resume_in_workqueue: defer resume function to workqueue * @irq_gpio: attention interrupt GPIO * @irq_on_state: attention interrupt active state * @power_gpio: power switch GPIO @@ -79,11 +81,13 @@ struct synaptics_dsx_button_map { * @bus_reg_name: pointer to name of regulator for bus pullup control * @cap_button_map: pointer to 0D button map * @vir_button_map: pointer to virtual button map + * @resume_in_workqueue: defer resume function to workqueue */ struct synaptics_dsx_board_data { bool x_flip; bool y_flip; bool swap_axes; + bool resume_in_workqueue; int irq_gpio; int irq_on_state; int power_gpio; |