Merge branch 'v4l_for_linus' into patchwork

[karo-tx-linux.git] / drivers / media / platform / exynos4-is / fimc-is.h

diff --git a/drivers/media/platform/exynos4-is/fimc-is.h b/drivers/media/platform/exynos4-is/fimc-is.h
index d7db133b493f7068e9f5281af8a2c95b9c21bf50..08fa518c34f754030aca4fb3afe0a5b5f195eae6 100644 (file)
--- a/drivers/media/platform/exynos4-is/fimc-is.h
+++ b/drivers/media/platform/exynos4-is/fimc-is.h
@@ -225,8 +225,7 @@ struct chain_config {
        struct drc_param        drc;
        struct fd_param         fd;
 
-       unsigned long           p_region_index1;
-       unsigned long           p_region_index2;
+       unsigned long           p_region_index[2];
 };
 
 /**
@@ -302,10 +301,7 @@ static inline void fimc_is_set_param_bit(struct fimc_is *is, int num)
 {
        struct chain_config *cfg = &is->config[is->config_index];
 
-       if (num >= 32)
-               set_bit(num - 32, &cfg->p_region_index2);
-       else
-               set_bit(num, &cfg->p_region_index1);
+       set_bit(num, &cfg->p_region_index[0]);
 }
 
 static inline void fimc_is_set_param_ctrl_cmd(struct fimc_is *is, int cmd)