diff options
| author | Dan Carpenter <dan.carpenter@oracle.com> | 2016-03-15 16:45:07 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2016-03-15 16:54:22 -0700 |
| commit | 24672bdfb357b91bed0ea8d432241bf7bdefc8a8 (patch) | |
| tree | 35134123c5c014e34d8e7caad19e5427115f80d8 /drivers/input/rmi4/rmi_f11.c | |
| parent | 9c6ba456711687b794dcf285856fc14e2c76074f (diff) | |
| download | linux-24672bdfb357b91bed0ea8d432241bf7bdefc8a8.tar.bz2 | |
Input: synaptics-rmi4 - using logical instead of bitwise AND
There is a typo so we have && instead of &.
Fixes: ff8f83708b3e ('Input: synaptics-rmi4 - add support for 2D sensors and F11')
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Acked-by: Andrew Duggan <aduggan@synaptics.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input/rmi4/rmi_f11.c')
| -rw-r--r-- | drivers/input/rmi4/rmi_f11.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/input/rmi4/rmi_f11.c b/drivers/input/rmi4/rmi_f11.c index 77a5eb84aed9..ec8a10d53288 100644 --- a/drivers/input/rmi4/rmi_f11.c +++ b/drivers/input/rmi4/rmi_f11.c @@ -775,7 +775,7 @@ static int rmi_f11_get_query_parameters(struct rmi_device *rmi_dev, sensor_query->has_abs = !!(query_buf[0] & RMI_F11_HAS_ABS); sensor_query->has_gestures = !!(query_buf[0] & RMI_F11_HAS_GESTURES); sensor_query->has_sensitivity_adjust = - !!(query_buf[0] && RMI_F11_HAS_SENSITIVITY_ADJ); + !!(query_buf[0] & RMI_F11_HAS_SENSITIVITY_ADJ); sensor_query->configurable = !!(query_buf[0] & RMI_F11_CONFIGURABLE); sensor_query->nr_x_electrodes = @@ -803,7 +803,7 @@ static int rmi_f11_get_query_parameters(struct rmi_device *rmi_dev, sensor_query->has_bending_correction = !!(query_buf[0] & RMI_F11_HAS_BENDING_CORRECTION); sensor_query->has_large_object_suppression = - !!(query_buf[0] && RMI_F11_HAS_LARGE_OBJECT_SUPPRESSION); + !!(query_buf[0] & RMI_F11_HAS_LARGE_OBJECT_SUPPRESSION); sensor_query->has_jitter_filter = !!(query_buf[0] & RMI_F11_HAS_JITTER_FILTER); query_size++; |