diff options
author | Dudley Du | 2015-10-12 12:16:16 -0500 |
---|---|---|
committer | Dmitry Torokhov | 2015-10-14 01:29:52 -0500 |
commit | a487c03fa28286d0de42558da1aa57d82d54fc4d (patch) | |
tree | 89ae8fc759e10fb9b774e5eef8258503c99bb349 /drivers/input/mouse | |
parent | 879f2fea8a5a748bcbf98d2cdce9139c045505d3 (diff) | |
download | kernel-omap-a487c03fa28286d0de42558da1aa57d82d54fc4d.tar.gz kernel-omap-a487c03fa28286d0de42558da1aa57d82d54fc4d.tar.xz kernel-omap-a487c03fa28286d0de42558da1aa57d82d54fc4d.zip |
Input: cyapa - fix the copy paste error on electrodes_rx value
Fix the copy paste error on the electrodes_rx value set code which will
cause the electrodes_rx value be always set to the value of electrodes_y.
Reported-by: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
Signed-off-by: Dudley Du <dudl@cypress.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input/mouse')
-rw-r--r-- | drivers/input/mouse/cyapa_gen6.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/drivers/input/mouse/cyapa_gen6.c b/drivers/input/mouse/cyapa_gen6.c index 5f191071d44a..e4eb048d1bf6 100644 --- a/drivers/input/mouse/cyapa_gen6.c +++ b/drivers/input/mouse/cyapa_gen6.c | |||
@@ -241,14 +241,10 @@ static int cyapa_gen6_read_sys_info(struct cyapa *cyapa) | |||
241 | memcpy(&cyapa->product_id[13], &resp_data[62], 2); | 241 | memcpy(&cyapa->product_id[13], &resp_data[62], 2); |
242 | cyapa->product_id[15] = '\0'; | 242 | cyapa->product_id[15] = '\0'; |
243 | 243 | ||
244 | /* Get the number of Rx electrodes. */ | ||
244 | rotat_align = resp_data[68]; | 245 | rotat_align = resp_data[68]; |
245 | if (rotat_align) { | 246 | cyapa->electrodes_rx = |
246 | cyapa->electrodes_rx = cyapa->electrodes_y; | 247 | rotat_align ? cyapa->electrodes_y : cyapa->electrodes_x; |
247 | cyapa->electrodes_rx = cyapa->electrodes_y; | ||
248 | } else { | ||
249 | cyapa->electrodes_rx = cyapa->electrodes_x; | ||
250 | cyapa->electrodes_rx = cyapa->electrodes_y; | ||
251 | } | ||
252 | cyapa->aligned_electrodes_rx = (cyapa->electrodes_rx + 3) & ~3u; | 248 | cyapa->aligned_electrodes_rx = (cyapa->electrodes_rx + 3) & ~3u; |
253 | 249 | ||
254 | if (!cyapa->electrodes_x || !cyapa->electrodes_y || | 250 | if (!cyapa->electrodes_x || !cyapa->electrodes_y || |