[PATCH] staging: vc04_services: vchiq_arm: Fix initialisation check

Dan Carpenter dan.carpenter at linaro.org
Thu Jun 13 12:58:40 PDT 2024


On Thu, Jun 13, 2024 at 08:41:45PM +0100, Kieran Bingham wrote:
> ---
>  .../staging/vc04_services/interface/vchiq_arm/vchiq_arm.c  | 4 ++--
>  .../staging/vc04_services/interface/vchiq_arm/vchiq_core.h | 5 +++++
>  .../staging/vc04_services/interface/vchiq_arm/vchiq_dev.c  | 7 ++++++-
>  3 files changed, 13 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
> index 54467be8c371..67d853f5f2a0 100644
> --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
> +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
> @@ -804,7 +804,7 @@ int vchiq_initialise(struct vchiq_state *state, struct vchiq_instance **instance
>  	 * block forever.
>  	 */
>  	for (i = 0; i < VCHIQ_INIT_RETRIES; i++) {
> -		if (state)
> +		if (vchiq_remote_initialised(state))
>  			break;
>  		usleep_range(500, 600);
>  	}

:/  In the original code, this would either break on the first iteration
or fail.  The diff looked like this:

        for (i = 0; i < VCHIQ_INIT_RETRIES; i++) {
-               state = vchiq_get_state();
                if (state)
                        break;

I feel bad for not spotting this.  A static checker which looked at
diffs could have made this work, but all of our tools look at a momement
in time instead of looking at the change over time.

regards,
dan carpenter




More information about the linux-arm-kernel mailing list