Merge branches 'for-4.11/upstream-fixes', 'for-4.12/accutouch', 'for-4.12/cp2112...

[mirror_ubuntu-artful-kernel.git] / drivers / media / platform / exynos4-is / fimc-is.c

diff --git a/drivers/media/platform/exynos4-is/fimc-is.c b/drivers/media/platform/exynos4-is/fimc-is.c
index 518ad34f80d7c4e1d29d7313568d8f4087f7cc5d..7f92144a1de3acd812dde54c70b32bd901a8959c 100644 (file)
--- a/drivers/media/platform/exynos4-is/fimc-is.c
+++ b/drivers/media/platform/exynos4-is/fimc-is.c
@@ -825,12 +825,13 @@ static int fimc_is_probe(struct platform_device *pdev)
        is->irq = irq_of_parse_and_map(dev->of_node, 0);
        if (!is->irq) {
                dev_err(dev, "no irq found\n");
-               return -EINVAL;
+               ret = -EINVAL;
+               goto err_iounmap;
        }
 
        ret = fimc_is_get_clocks(is);
        if (ret < 0)
-               return ret;
+               goto err_iounmap;
 
        platform_set_drvdata(pdev, is);
 
@@ -891,6 +892,8 @@ err_irq:
        free_irq(is->irq, is);
 err_clk:
        fimc_is_put_clocks(is);
+err_iounmap:
+       iounmap(is->pmu_regs);
        return ret;
 }
 
@@ -947,6 +950,7 @@ static int fimc_is_remove(struct platform_device *pdev)
        fimc_is_unregister_subdevs(is);
        vb2_dma_contig_clear_max_seg_size(dev);
        fimc_is_put_clocks(is);
+       iounmap(is->pmu_regs);
        fimc_is_debugfs_remove(is);
        release_firmware(is->fw.f_w);
        fimc_is_free_cpu_memory(is);