diff options
| author | Jubeom Kim <jubeomk@nvidia.com> | 2011-06-22 23:40:43 +0900 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-11-30 21:47:36 -0800 |
| commit | f04391a5ff4208ea885b39c5146308b7da7ff2ab (patch) | |
| tree | 8bbaded6d30ae9ccda8acd0db877ebdcd03ba904 /drivers | |
| parent | 59d9f2786bd384f0569b7fb24debddf3a233c7bd (diff) | |
video: tegra: fix the free sequence in tegra_fb_register.
Fix err_delete_wq and err_put_client of error handling.
Reviewed-on: http://git-master/r/37870
(cherry picked from commit 794cd34757fe7193b0e2f1847335d127840fd4a3)
Original-Change-Id: If8bf04b6a5a473b3c13017ea8ad2c33cd7b4954e
Reviewed-on: http://git-master/r/38447
Reviewed-by: Varun Colbert <vcolbert@nvidia.com>
Tested-by: Varun Colbert <vcolbert@nvidia.com>
Rebase-Id: R2a5f0f6e618d8d3a728f2ecb28eddb613280c99e
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/video/tegra/fb.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/video/tegra/fb.c b/drivers/video/tegra/fb.c index 2d40e22a697e..41ea43688700 100644 --- a/drivers/video/tegra/fb.c +++ b/drivers/video/tegra/fb.c @@ -776,7 +776,7 @@ struct tegra_fb_info *tegra_fb_register(struct nvhost_device *ndev, if (!tegra_fb->flip_wq) { dev_err(&ndev->dev, "couldn't create flip work-queue\n"); ret = -ENOMEM; - goto err_delete_wq; + goto err_put_client; } if (fb_mem) { @@ -786,7 +786,7 @@ struct tegra_fb_info *tegra_fb_register(struct nvhost_device *ndev, if (!fb_base) { dev_err(&ndev->dev, "fb can't be mapped\n"); ret = -EBUSY; - goto err_put_client; + goto err_delete_wq; } tegra_fb->valid = true; } @@ -866,10 +866,10 @@ struct tegra_fb_info *tegra_fb_register(struct nvhost_device *ndev, err_iounmap_fb: iounmap(fb_base); -err_put_client: - nvmap_client_put(tegra_fb->fb_nvmap); err_delete_wq: destroy_workqueue(tegra_fb->flip_wq); +err_put_client: + nvmap_client_put(tegra_fb->fb_nvmap); err_free: framebuffer_release(info); err: |