gpu: host1x: Fix an error handling path in 'host1x_probe()'

Add the missing 'host1x_bo_cache_destroy()' call in the error handling
path of the probe, as already done in the remove function.

In order to simplify the error handling, move the 'host1x_bo_cache_init()'
call after all the devm_ function.

Fixes: 1f39b1dfa53c ("drm/tegra: Implement buffer object cache")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: Thierry Reding <treding@nvidia.com>

diff --git a/drivers/gpu/host1x/dev.c b/drivers/gpu/host1x/dev.c
index 6994f8c0e02ea15a53bf21a10c26587c5a0a2fd5..9605495f001ad797c7f7c25d093bfee1970df4ad 100644 (file)
--- a/drivers/gpu/host1x/dev.c
+++ b/drivers/gpu/host1x/dev.c
@@ -447,7 +447,6 @@ static int host1x_probe(struct platform_device *pdev)
        if (syncpt_irq < 0)
                return syncpt_irq;
 
-       host1x_bo_cache_init(&host->cache);
        mutex_init(&host->devices_lock);
        INIT_LIST_HEAD(&host->devices);
        INIT_LIST_HEAD(&host->list);
@@ -489,10 +488,12 @@ static int host1x_probe(struct platform_device *pdev)
        if (err)
                return err;
 
+       host1x_bo_cache_init(&host->cache);
+
        err = host1x_iommu_init(host);
        if (err < 0) {
                dev_err(&pdev->dev, "failed to setup IOMMU: %d\n", err);
-               return err;
+               goto destroy_cache;
        }
 
        err = host1x_channel_list_init(&host->channel_list,
@@ -553,6 +554,8 @@ free_channels:
        host1x_channel_list_free(&host->channel_list);
 iommu_exit:
        host1x_iommu_exit(host);
+destroy_cache:
+       host1x_bo_cache_destroy(&host->cache);
 
        return err;
 }