3 files changed, 27 insertions, 12 deletions

diff --git a/drivers/media/platform/davinci/dm644x_ccdc.c b/drivers/media/platform/davinci/dm644x_ccdc.c
index 318e80512998..971d639b6674 100644
--- a/drivers/media/platform/davinci/dm644x_ccdc.c
+++ b/drivers/media/platform/davinci/dm644x_ccdc.c
@@ -228,9 +228,12 @@ static void ccdc_readregs(void)
 static int validate_ccdc_param(struct ccdc_config_params_raw *ccdcparam)
 {
         if (ccdcparam->alaw.enable) {
-                if ((ccdcparam->alaw.gama_wd > CCDC_GAMMA_BITS_09_0) ||
-                    (ccdcparam->alaw.gama_wd < CCDC_GAMMA_BITS_15_6) ||
-                    (ccdcparam->alaw.gama_wd < ccdcparam->data_sz)) {
+                u8 max_gamma = ccdc_gamma_width_max_bit(ccdcparam->alaw.gamma_wd);
+                u8 max_data = ccdc_data_size_max_bit(ccdcparam->data_sz);
+
+                if ((ccdcparam->alaw.gamma_wd > CCDC_GAMMA_BITS_09_0) ||
+                    (ccdcparam->alaw.gamma_wd < CCDC_GAMMA_BITS_15_6) ||
+                    (max_gamma > max_data)) {
                         dev_dbg(ccdc_cfg.dev, "\nInvalid data line select");
                         return -1;
                 }
@@ -560,8 +563,8 @@ void ccdc_config_raw(void)
 
         /* Enable and configure aLaw register if needed */
         if (config_params->alaw.enable) {
-                val = ((config_params->alaw.gama_wd &
-                      CCDC_ALAW_GAMA_WD_MASK) | CCDC_ALAW_ENABLE);
+                val = ((config_params->alaw.gamma_wd &
+                      CCDC_ALAW_GAMMA_WD_MASK) | CCDC_ALAW_ENABLE);
                 regw(val, CCDC_ALAW);
                 dev_dbg(ccdc_cfg.dev, "\nWriting 0x%x to ALAW...\n", val);
         }
diff --git a/drivers/media/platform/davinci/dm644x_ccdc_regs.h b/drivers/media/platform/davinci/dm644x_ccdc_regs.h
index 90370e414e2c..2b0aca5383f0 100644
--- a/drivers/media/platform/davinci/dm644x_ccdc_regs.h
+++ b/drivers/media/platform/davinci/dm644x_ccdc_regs.h
@@ -84,7 +84,7 @@
 #define CCDC_VDHDEN_ENABLE                      (1 << 16)
 #define CCDC_LPF_ENABLE                         (1 << 14)
 #define CCDC_ALAW_ENABLE                        (1 << 3)
-#define CCDC_ALAW_GAMA_WD_MASK                  7
+#define CCDC_ALAW_GAMMA_WD_MASK                 7
 #define CCDC_BLK_CLAMP_ENABLE                   (1 << 31)
 #define CCDC_BLK_SGAIN_MASK                     0x1F
 #define CCDC_BLK_ST_PXL_MASK                    0x7FFF
diff --git a/include/media/davinci/dm644x_ccdc.h b/include/media/davinci/dm644x_ccdc.h
index 3e178eb52fb3..852e96c4bb46 100644
--- a/include/media/davinci/dm644x_ccdc.h
+++ b/include/media/davinci/dm644x_ccdc.h
@@ -38,17 +38,23 @@ enum ccdc_sample_line {
         CCDC_SAMPLE_16LINES
 };
 
-/* enum for Alaw gama width */
-enum ccdc_gama_width {
-        CCDC_GAMMA_BITS_15_6,
+/* enum for Alaw gamma width */
+enum ccdc_gamma_width {
+        CCDC_GAMMA_BITS_15_6,   /* use bits 15-6 for gamma */
         CCDC_GAMMA_BITS_14_5,
         CCDC_GAMMA_BITS_13_4,
         CCDC_GAMMA_BITS_12_3,
         CCDC_GAMMA_BITS_11_2,
         CCDC_GAMMA_BITS_10_1,
-        CCDC_GAMMA_BITS_09_0
+        CCDC_GAMMA_BITS_09_0    /* use bits 9-0 for gamma */
 };
 
+/* returns the highest bit used for the gamma */
+static inline u8 ccdc_gamma_width_max_bit(enum ccdc_gamma_width width)
+{
+        return 15 - width;
+}
+
 enum ccdc_data_size {
         CCDC_DATA_16BITS,
         CCDC_DATA_15BITS,
@@ -60,12 +66,18 @@ enum ccdc_data_size {
         CCDC_DATA_8BITS
 };
 
+/* returns the highest bit used for this data size */
+static inline u8 ccdc_data_size_max_bit(enum ccdc_data_size sz)
+{
+        return sz == CCDC_DATA_8BITS ? 7 : 15 - sz;
+}
+
 /* structure for ALaw */
 struct ccdc_a_law {
         /* Enable/disable A-Law */
         unsigned char enable;
-        /* Gama Width Input */
-        enum ccdc_gama_width gama_wd;
+        /* Gamma Width Input */
+        enum ccdc_gamma_width gamma_wd;
 };
 
 /* structure for Black Clamping */