aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input/rmi4/rmi_driver.c
diff options
context:
space:
mode:
authorAndrew Duggan <aduggan@synaptics.com>2016-03-17 20:06:24 -0400
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2016-03-17 20:15:56 -0400
commita1376d3de45d3ebc26ecd8f5a57b902f52157082 (patch)
tree6fcebaadcd6f6fef0a72e8390a39bd22eb519d4c /drivers/input/rmi4/rmi_driver.c
parent2d5f5611dd0de52e9a52b56391a7049a52184e72 (diff)
Input: synaptics-rmi4 - remove check of Non-NULL array
Originally the irq_mask member of rmi_function was a pointer. Then it was switched to being a zero length array. However, the checks for a NULL pointer where not removed. Signed-off-by: Andrew Duggan <aduggan@synaptics.com> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input/rmi4/rmi_driver.c')
-rw-r--r--drivers/input/rmi4/rmi_driver.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/input/rmi4/rmi_driver.c b/drivers/input/rmi4/rmi_driver.c
index da38f0ad80ed..faa295ec4f31 100644
--- a/drivers/input/rmi4/rmi_driver.c
+++ b/drivers/input/rmi4/rmi_driver.c
@@ -126,7 +126,7 @@ static void process_one_interrupt(struct rmi_driver_data *data,
126 return; 126 return;
127 127
128 fh = to_rmi_function_handler(fn->dev.driver); 128 fh = to_rmi_function_handler(fn->dev.driver);
129 if (fn->irq_mask && fh->attention) { 129 if (fh->attention) {
130 bitmap_and(data->fn_irq_bits, data->irq_status, fn->irq_mask, 130 bitmap_and(data->fn_irq_bits, data->irq_status, fn->irq_mask,
131 data->irq_count); 131 data->irq_count);
132 if (!bitmap_empty(data->fn_irq_bits, data->irq_count)) 132 if (!bitmap_empty(data->fn_irq_bits, data->irq_count))
@@ -172,8 +172,7 @@ int rmi_process_interrupt_requests(struct rmi_device *rmi_dev)
172 * use irq_chip. 172 * use irq_chip.
173 */ 173 */
174 list_for_each_entry(entry, &data->function_list, node) 174 list_for_each_entry(entry, &data->function_list, node)
175 if (entry->irq_mask) 175 process_one_interrupt(data, entry);
176 process_one_interrupt(data, entry);
177 176
178 if (data->input) 177 if (data->input)
179 input_sync(data->input); 178 input_sync(data->input);