Merge branch 'pm-cpufreq-fixes'

[deliverable/linux.git] / drivers / media / platform / exynos4-is / mipi-csis.c

diff --git a/drivers/media/platform/exynos4-is/mipi-csis.c b/drivers/media/platform/exynos4-is/mipi-csis.c
index bd5c46c3d4b7bedc362c29cb473c8206f84026b3..bf954424e7be0dc7d53b8e5914a678e13dc738f1 100644 (file)
--- a/drivers/media/platform/exynos4-is/mipi-csis.c
+++ b/drivers/media/platform/exynos4-is/mipi-csis.c
@@ -757,8 +757,10 @@ static int s5pcsis_parse_dt(struct platform_device *pdev,
                goto err;
 
        state->index = endpoint.base.port - FIMC_INPUT_MIPI_CSI2_0;
-       if (state->index >= CSIS_MAX_ENTITIES)
-               return -ENXIO;
+       if (state->index >= CSIS_MAX_ENTITIES) {
+               ret = -ENXIO;
+               goto err;
+       }
 
        /* Get MIPI CSI-2 bus configration from the endpoint node. */
        of_property_read_u32(node, "samsung,csis-hs-settle",