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 <dan.carpenter@xxxxxxxxxx>
>
> Acked-by: Andrew Duggan <aduggan@xxxxxxxxxxxxx>
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
--
To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
