From: Dan Carpenter Date: Tue, 15 Mar 2016 23:45:07 +0000 (-0700) Subject: Input: synaptics-rmi4 - using logical instead of bitwise AND X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=24672bdfb357b91bed0ea8d432241bf7bdefc8a8;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git 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 Acked-by: Andrew Duggan Signed-off-by: Dmitry Torokhov --- 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++;