gpu: host1x: Disable clock on probe failure
authorWei Yongjun <yongjun_wei@trendmicro.com.cn>
Mon, 21 Oct 2013 05:37:31 +0000 (13:37 +0800)
committerThierry Reding <treding@nvidia.com>
Thu, 31 Oct 2013 08:55:46 +0000 (09:55 +0100)
Add a missing clk_disable_unprepare() before returning from the driver's
.probe() function on error.

Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>
drivers/gpu/host1x/dev.c

index ab402a56284c5ce4e91c01925fb7c5fbc2a6c290..80da003d63de8d4b754cd37a607441c7c4901574 100644 (file)
@@ -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;
 }