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 <[email protected]>
diff --git a/drivers/input/rmi4/rmi_f11.c b/drivers/input/rmi4/rmi_f11.c
index 77a5eb8..ec8a10d 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++;
On Tue, 2016-03-15 at 10:11 +0300, Dan Carpenter wrote:
> 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 <[email protected]>
>
> diff --git 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++;
Right and as well these are bool so the !! isn't necessary.
On Tue, Mar 15, 2016 at 01:33:29AM -0700, Joe Perches wrote:
> Right and as well these are bool so the !! isn't necessary.
Not necessary but nice for reading...
regards,
dan carpenter
On Tue, 2016-03-15 at 11:37 +0300, Dan Carpenter wrote:
> On Tue, Mar 15, 2016 at 01:33:29AM -0700, Joe Perches wrote:
> >
> > Right and as well these are bool so the !! isn't necessary.
> Not necessary but nice for reading...
<shrug> opinions vary.
cheers, Joe
On 03/15/2016 12:11 AM, Dan Carpenter wrote:
> 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 <[email protected]>
Acked-by: Andrew Duggan <[email protected]>
> diff --git a/drivers/input/rmi4/rmi_f11.c b/drivers/input/rmi4/rmi_f11.c
> index 77a5eb8..ec8a10d 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++;
On Tue, Mar 15, 2016 at 02:20:02PM -0700, Andrew Duggan wrote:
> On 03/15/2016 12:11 AM, Dan Carpenter wrote:
> >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 <[email protected]>
>
> Acked-by: Andrew Duggan <[email protected]>
Applied, thank you.
>
> >diff --git a/drivers/input/rmi4/rmi_f11.c b/drivers/input/rmi4/rmi_f11.c
> >index 77a5eb8..ec8a10d 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++;
>
--
Dmitry