1 files changed, 32 insertions, 1 deletions

diff --git a/drivers/media/v4l2-core/v4l2-ctrls.c b/drivers/media/v4l2-core/v4l2-ctrls.c
index 6ff002bd5909..55c683254102 100644
--- a/drivers/media/v4l2-core/v4l2-ctrls.c
+++ b/drivers/media/v4l2-core/v4l2-ctrls.c
@@ -735,6 +735,8 @@ const char *v4l2_ctrl_get_name(u32 id)
         case V4L2_CID_MPEG_VIDEO_DEC_PTS:                       return "Video Decoder PTS";
         case V4L2_CID_MPEG_VIDEO_DEC_FRAME:                     return "Video Decoder Frame Count";
         case V4L2_CID_MPEG_VIDEO_VBV_DELAY:                     return "Initial Delay for VBV Control";
+        case V4L2_CID_MPEG_VIDEO_MV_H_SEARCH_RANGE:             return "Horizontal MV Search Range";
+        case V4L2_CID_MPEG_VIDEO_MV_V_SEARCH_RANGE:             return "Vertical MV Search Range";
         case V4L2_CID_MPEG_VIDEO_REPEAT_SEQ_HEADER:             return "Repeat Sequence Header";
 
         /* VPX controls */
@@ -857,6 +859,17 @@ const char *v4l2_ctrl_get_name(u32 id)
         case V4L2_CID_FM_RX_CLASS:              return "FM Radio Receiver Controls";
         case V4L2_CID_TUNE_DEEMPHASIS:          return "De-Emphasis";
         case V4L2_CID_RDS_RECEPTION:            return "RDS Reception";
+
+        case V4L2_CID_RF_TUNER_CLASS:           return "RF Tuner Controls";
+        case V4L2_CID_RF_TUNER_LNA_GAIN_AUTO:   return "LNA Gain, Auto";
+        case V4L2_CID_RF_TUNER_LNA_GAIN:        return "LNA Gain";
+        case V4L2_CID_RF_TUNER_MIXER_GAIN_AUTO: return "Mixer Gain, Auto";
+        case V4L2_CID_RF_TUNER_MIXER_GAIN:      return "Mixer Gain";
+        case V4L2_CID_RF_TUNER_IF_GAIN_AUTO:    return "IF Gain, Auto";
+        case V4L2_CID_RF_TUNER_IF_GAIN:         return "IF Gain";
+        case V4L2_CID_RF_TUNER_BANDWIDTH_AUTO:  return "Bandwidth, Auto";
+        case V4L2_CID_RF_TUNER_BANDWIDTH:       return "Bandwidth";
+        case V4L2_CID_RF_TUNER_PLL_LOCK:        return "PLL Lock";
         default:
                 return NULL;
         }
@@ -906,10 +919,19 @@ void v4l2_ctrl_fill(u32 id, const char **name, enum v4l2_ctrl_type *type,
         case V4L2_CID_WIDE_DYNAMIC_RANGE:
         case V4L2_CID_IMAGE_STABILIZATION:
         case V4L2_CID_RDS_RECEPTION:
+        case V4L2_CID_RF_TUNER_LNA_GAIN_AUTO:
+        case V4L2_CID_RF_TUNER_MIXER_GAIN_AUTO:
+        case V4L2_CID_RF_TUNER_IF_GAIN_AUTO:
+        case V4L2_CID_RF_TUNER_BANDWIDTH_AUTO:
+        case V4L2_CID_RF_TUNER_PLL_LOCK:
                 *type = V4L2_CTRL_TYPE_BOOLEAN;
                 *min = 0;
                 *max = *step = 1;
                 break;
+        case V4L2_CID_MPEG_VIDEO_MV_H_SEARCH_RANGE:
+        case V4L2_CID_MPEG_VIDEO_MV_V_SEARCH_RANGE:
+                *type = V4L2_CTRL_TYPE_INTEGER;
+                break;
         case V4L2_CID_PAN_RESET:
         case V4L2_CID_TILT_RESET:
         case V4L2_CID_FLASH_STROBE:
@@ -991,6 +1013,7 @@ void v4l2_ctrl_fill(u32 id, const char **name, enum v4l2_ctrl_type *type,
         case V4L2_CID_IMAGE_PROC_CLASS:
         case V4L2_CID_DV_CLASS:
         case V4L2_CID_FM_RX_CLASS:
+        case V4L2_CID_RF_TUNER_CLASS:
                 *type = V4L2_CTRL_TYPE_CTRL_CLASS;
                 /* You can neither read not write these */
                 *flags |= V4L2_CTRL_FLAG_READ_ONLY | V4L2_CTRL_FLAG_WRITE_ONLY;
@@ -1063,6 +1086,10 @@ void v4l2_ctrl_fill(u32 id, const char **name, enum v4l2_ctrl_type *type,
         case V4L2_CID_PILOT_TONE_FREQUENCY:
         case V4L2_CID_TUNE_POWER_LEVEL:
         case V4L2_CID_TUNE_ANTENNA_CAPACITOR:
+        case V4L2_CID_RF_TUNER_LNA_GAIN:
+        case V4L2_CID_RF_TUNER_MIXER_GAIN:
+        case V4L2_CID_RF_TUNER_IF_GAIN:
+        case V4L2_CID_RF_TUNER_BANDWIDTH:
                 *flags |= V4L2_CTRL_FLAG_SLIDER;
                 break;
         case V4L2_CID_PAN_RELATIVE:
@@ -1081,6 +1108,9 @@ void v4l2_ctrl_fill(u32 id, const char **name, enum v4l2_ctrl_type *type,
         case V4L2_CID_DV_RX_POWER_PRESENT:
                 *flags |= V4L2_CTRL_FLAG_READ_ONLY;
                 break;
+        case V4L2_CID_RF_TUNER_PLL_LOCK:
+                *flags |= V4L2_CTRL_FLAG_VOLATILE;
+                break;
         }
 }
 EXPORT_SYMBOL(v4l2_ctrl_fill);
@@ -1921,7 +1951,8 @@ void v4l2_ctrl_cluster(unsigned ncontrols, struct v4l2_ctrl **controls)
         int i;
 
         /* The first control is the master control and it must not be NULL */
-        BUG_ON(ncontrols == 0 || controls[0] == NULL);
+        if (WARN_ON(ncontrols == 0 || controls[0] == NULL))
+                return;
 
         for (i = 0; i < ncontrols; i++) {
                 if (controls[i]) {