[PATCH -next] gpu: host1x: add missing clk_disable_unprepare() on error in host1x_probe()

Terje Bergström tbergstrom at nvidia.com
Mon Oct 28 09:24:51 CET 2013


On 21.10.2013 08:37, Wei Yongjun wrote:
> From: Wei Yongjun <yongjun_wei at trendmicro.com.cn>
> 
> Add the missing clk_disable_unprepare() before return
> from host1x_probe() in the error handling case.
> 
> Signed-off-by: Wei Yongjun <yongjun_wei at trendmicro.com.cn>
> ---
>  drivers/gpu/host1x/dev.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/host1x/dev.c b/drivers/gpu/host1x/dev.c
> index 12d6333..646a333 100644
> --- a/drivers/gpu/host1x/dev.c
> +++ b/drivers/gpu/host1x/dev.c
> @@ -154,7 +154,7 @@ static int host1x_probe(struct platform_device *pdev)
>  	err = host1x_syncpt_init(host);
>  	if (err) {
>  		dev_err(&pdev->dev, "failed to initialize syncpts\n");
> -		return err;
> +		goto fail_unprepare_disable;
>  	}
>  
>  	err = host1x_intr_init(host, syncpt_irq);
> @@ -175,6 +175,8 @@ fail_deinit_intr:
>  	host1x_intr_deinit(host);
>  fail_deinit_syncpt:
>  	host1x_syncpt_deinit(host);
> +fail_unprepare_disable:
> +	clk_disable_unprepare(host->clk);
>  	return err;
>  }

Looks good.

Reviewed-by: Terje Bergstrom <tbergstrom at nvidia.com>

Terje


More information about the dri-devel mailing list