Skip to content

Commit a790df2

Browse files
committed
Input: synaptics-rmi4 - fix crash when DPM query is not supported
Stop clobbering "item" variable when checking if the device supports querying DPM values because its original value is still needed in case when we need to fall back to the old way of figuring sensor size. Reported-by: Richard Acayan <mailingradian@gmail.com> Tested-by: Richard Acayan <mailingradian@gmail.com> Fixes: 14d650f ("Input: synaptics-rmi4 - add support for querying DPM value (F12)") Link: https://lore.kernel.org/r/ZtdQW7nqAOEJDNBN@radian Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
1 parent 8f5ea12 commit a790df2

1 file changed

Lines changed: 2 additions & 3 deletions

File tree

drivers/input/rmi4/rmi_f12.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -129,9 +129,8 @@ static int rmi_f12_read_sensor_tuning(struct f12_data *f12)
129129
* Use the Query DPM feature when the resolution query register
130130
* exists.
131131
*/
132-
item = rmi_get_register_desc_item(&f12->query_reg_desc,
133-
RMI_F12_QUERY_RESOLUTION);
134-
if (item) {
132+
if (rmi_get_register_desc_item(&f12->query_reg_desc,
133+
RMI_F12_QUERY_RESOLUTION)) {
135134
offset = rmi_register_desc_calc_reg_offset(&f12->query_reg_desc,
136135
RMI_F12_QUERY_RESOLUTION);
137136
query_dpm_addr = fn->fd.query_base_addr + offset;

0 commit comments

Comments
 (0)