diff options
| author | Sylwester Nawrocki <s.nawrocki@samsung.com> | 2013-10-19 19:07:51 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2014-01-02 14:25:56 -0200 |
| commit | da8cec30b03e8080494996b8edc0fcebfa5ef871 (patch) | |
| tree | 9c68f7c8e02254b372dd92a4746a831a356ef5cb /drivers/media/platform/exynos4-is | |
| parent | 84f14456716ad860852f25cd144f195c5c66ca62 (diff) | |
| download | op-kernel-dev-da8cec30b03e8080494996b8edc0fcebfa5ef871.zip op-kernel-dev-da8cec30b03e8080494996b8edc0fcebfa5ef871.tar.gz | |
[media] exynos4-is: Correct clean up sequence on error path in fimc_is_probe()
The memory allocator is being initialized before registering the subdevs
so reverse the cleanup sequence to avoid trying unregister not registered
subdevs.
Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'drivers/media/platform/exynos4-is')
| -rw-r--r-- | drivers/media/platform/exynos4-is/fimc-is.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/platform/exynos4-is/fimc-is.c b/drivers/media/platform/exynos4-is/fimc-is.c index 9770fa9..8cb70c2 100644 --- a/drivers/media/platform/exynos4-is/fimc-is.c +++ b/drivers/media/platform/exynos4-is/fimc-is.c @@ -867,10 +867,10 @@ static int fimc_is_probe(struct platform_device *pdev) err_dfs: fimc_is_debugfs_remove(is); -err_vb: - vb2_dma_contig_cleanup_ctx(is->alloc_ctx); err_sd: fimc_is_unregister_subdevs(is); +err_vb: + vb2_dma_contig_cleanup_ctx(is->alloc_ctx); err_irq: free_irq(is->irq, is); err_clk: |
