Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Tue, 23 Feb 2021 11:29:00 +0100
From:   Michael Tretter <m.tretter@pengutronix.de>
To:     Geert Uytterhoeven <geert+renesas@glider.be>
Cc:     Dmitry Torokhov <dmitry.torokhov@gmail.com>,
        Andrej Valek <andrej.valek@siemens.com>,
        linux-input@vger.kernel.org, linux-renesas-soc@vger.kernel.org,
        linux-kernel@vger.kernel.org
Subject: Re: [PATCH] Input: st1232 - Fix NORMAL vs. IDLE state handling
Message-ID: <20210223102900.GA8833@pengutronix.de>
References: <20210223090201.1430542-1-geert+renesas@glider.be>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
In-Reply-To: <20210223090201.1430542-1-geert+renesas@glider.be>
User-Agent: Mutt/1.10.1 (2018-07-13)
Precedence: bulk

On Tue, 23 Feb 2021 10:02:01 +0100, Geert Uytterhoeven wrote:
> NORMAL (0x0) and IDLE (0x4) are really two different states.  Hence you
> cannot check for both using a bitmask, as that checks for IDLE only,
> breaking operation for devices that are in NORMAL state.

Thanks. I missed that the state is actually a value and not a bitfield.

> 
> Fix the wait function to report either state as ready.
> 
> Fixes: 6524d8eac258452e ("Input: st1232 - add IDLE state as ready condition")
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>

Reviewed-by: Michael Tretter <m.tretter@pengutronix.de>

> ---
>  drivers/input/touchscreen/st1232.c | 9 +++++++--
>  1 file changed, 7 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/input/touchscreen/st1232.c b/drivers/input/touchscreen/st1232.c
> index 885f0572488dd061..6abae665ca71d8ec 100644
> --- a/drivers/input/touchscreen/st1232.c
> +++ b/drivers/input/touchscreen/st1232.c
> @@ -94,8 +94,13 @@ static int st1232_ts_wait_ready(struct st1232_ts_data *ts)
>  
>  	for (retries = 10; retries; retries--) {
>  		error = st1232_ts_read_data(ts, REG_STATUS, 1);
> -		if (!error && ts->read_buf[0] == (STATUS_NORMAL | STATUS_IDLE | ERROR_NONE))
> -			return 0;
> +		if (!error) {
> +			switch (ts->read_buf[0]) {
> +			case STATUS_NORMAL | ERROR_NONE:
> +			case STATUS_IDLE | ERROR_NONE:
> +				return 0;
> +			}
> +		}
>  
>  		usleep_range(1000, 2000);
>  	}
> -- 
> 2.25.1
> 
>