From: Sylwester Nawrocki Date: Sat, 19 Oct 2013 22:07:51 +0000 (-0300) Subject: [media] exynos4-is: Correct clean up sequence on error path in fimc_is_probe() X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=da8cec30b03e8080494996b8edc0fcebfa5ef871;p=linux-beck.git [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 Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/platform/exynos4-is/fimc-is.c b/drivers/media/platform/exynos4-is/fimc-is.c index 9770fa98d6a1..8cb70c279d09 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: