[PATCH] staging: iio: tsl2x7x_core: fix proximity treshold

[PATCH] staging: iio: tsl2x7x_core: fix proximity treshold

[Mario Schuknecht]

Consider high byte of proximity min and max treshold in function
'tsl2x7x_chip_on'. So far, the high byte was not set.

Signed-off-by: Mario Schuknecht <mario.schuknecht@dresearch-fe.de>
---
 drivers/staging/iio/light/tsl2x7x_core.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/iio/light/tsl2x7x_core.c b/drivers/staging/iio/light/tsl2x7x_core.c
index 9e0f2a9..ab338e3 100644
--- a/drivers/staging/iio/light/tsl2x7x_core.c
+++ b/drivers/staging/iio/light/tsl2x7x_core.c
@@ -667,9 +667,13 @@ static int tsl2x7x_chip_on(struct iio_dev *indio_dev)
 	chip->tsl2x7x_config[TSL2X7X_PRX_COUNT] =
 			chip->tsl2x7x_settings.prox_pulse_count;
 	chip->tsl2x7x_config[TSL2X7X_PRX_MINTHRESHLO] =
-	chip->tsl2x7x_settings.prox_thres_low;
+			(chip->tsl2x7x_settings.prox_thres_low) & 0xFF;
+	chip->tsl2x7x_config[TSL2X7X_PRX_MINTHRESHHI] =
+			(chip->tsl2x7x_settings.prox_thres_low >> 8) & 0xFF;
 	chip->tsl2x7x_config[TSL2X7X_PRX_MAXTHRESHLO] =
-			chip->tsl2x7x_settings.prox_thres_high;
+			(chip->tsl2x7x_settings.prox_thres_high) & 0xFF;
+	chip->tsl2x7x_config[TSL2X7X_PRX_MAXTHRESHHI] =
+			(chip->tsl2x7x_settings.prox_thres_high >> 8) & 0xFF;
 
 	/* and make sure we're not already on */
 	if (chip->tsl2x7x_chip_status == TSL2X7X_CHIP_WORKING) {
-- 
1.8.1.4

Re: [PATCH] staging: iio: tsl2x7x_core: fix proximity treshold

[Jonathan Cameron]

On 27/05/14 07:19, Mario Schuknecht wrote:
> Consider high byte of proximity min and max treshold in function
> 'tsl2x7x_chip_on'. So far, the high byte was not set.
>
> Signed-off-by: Mario Schuknecht <mario.schuknecht@dresearch-fe.de>
Looks right to me.

Jon, it's your driver so do you have a few mins to check this?  Given
timing this won't go in until the merge window has closed now anyway
so you have a few weeks.  Looks like stable material though so I'll
mark it as such when I apply it.


> ---
>   drivers/staging/iio/light/tsl2x7x_core.c | 8 ++++++--
>   1 file changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/staging/iio/light/tsl2x7x_core.c b/drivers/staging/iio/light/tsl2x7x_core.c
> index 9e0f2a9..ab338e3 100644
> --- a/drivers/staging/iio/light/tsl2x7x_core.c
> +++ b/drivers/staging/iio/light/tsl2x7x_core.c
> @@ -667,9 +667,13 @@ static int tsl2x7x_chip_on(struct iio_dev *indio_dev)
>   	chip->tsl2x7x_config[TSL2X7X_PRX_COUNT] =
>   			chip->tsl2x7x_settings.prox_pulse_count;
>   	chip->tsl2x7x_config[TSL2X7X_PRX_MINTHRESHLO] =
> -	chip->tsl2x7x_settings.prox_thres_low;
> +			(chip->tsl2x7x_settings.prox_thres_low) & 0xFF;
> +	chip->tsl2x7x_config[TSL2X7X_PRX_MINTHRESHHI] =
> +			(chip->tsl2x7x_settings.prox_thres_low >> 8) & 0xFF;
>   	chip->tsl2x7x_config[TSL2X7X_PRX_MAXTHRESHLO] =
> -			chip->tsl2x7x_settings.prox_thres_high;
> +			(chip->tsl2x7x_settings.prox_thres_high) & 0xFF;
> +	chip->tsl2x7x_config[TSL2X7X_PRX_MAXTHRESHHI] =
> +			(chip->tsl2x7x_settings.prox_thres_high >> 8) & 0xFF;
>
>   	/* and make sure we're not already on */
>   	if (chip->tsl2x7x_chip_status == TSL2X7X_CHIP_WORKING) {
>