1 files changed, 17 insertions, 0 deletions

diff --git a/drivers/media/video/v4l2-ctrls.c b/drivers/media/video/v4l2-ctrls.c
index 5bfef90e88e..56ac71c8ba3 100644
--- a/drivers/media/video/v4l2-ctrls.c
+++ b/drivers/media/video/v4l2-ctrls.c
@@ -249,6 +249,19 @@ const char * const *v4l2_ctrl_get_menu(u32 id)
                 "Set Cb/Cr",
                 NULL
         };
+        static const char * const auto_n_preset_white_balance[] = {
+                "Manual",
+                "Auto",
+                "Incandescent",
+                "Fluorescent",
+                "Fluorescent H",
+                "Horizon",
+                "Daylight",
+                "Flash",
+                "Cloudy",
+                "Shade",
+                NULL,
+        };
         static const char * const tune_preemphasis[] = {
                 "No Preemphasis",
                 "50 Microseconds",
@@ -418,6 +431,8 @@ const char * const *v4l2_ctrl_get_menu(u32 id)
                 return camera_exposure_auto;
         case V4L2_CID_COLORFX:
                 return colorfx;
+        case V4L2_CID_AUTO_N_PRESET_WHITE_BALANCE:
+                return auto_n_preset_white_balance;
         case V4L2_CID_TUNE_PREEMPHASIS:
                 return tune_preemphasis;
         case V4L2_CID_FLASH_LED_MODE:
@@ -605,6 +620,7 @@ const char *v4l2_ctrl_get_name(u32 id)
         case V4L2_CID_IRIS_ABSOLUTE:            return "Iris, Absolute";
         case V4L2_CID_IRIS_RELATIVE:            return "Iris, Relative";
         case V4L2_CID_AUTO_EXPOSURE_BIAS:       return "Auto Exposure, Bias";
+        case V4L2_CID_AUTO_N_PRESET_WHITE_BALANCE: return "White Balance, Auto & Preset";
 
         /* FM Radio Modulator control */
         /* Keep the order of the 'case's the same as in videodev2.h! */
@@ -739,6 +755,7 @@ void v4l2_ctrl_fill(u32 id, const char **name, enum v4l2_ctrl_type *type,
         case V4L2_CID_MPEG_STREAM_VBI_FMT:
         case V4L2_CID_EXPOSURE_AUTO:
         case V4L2_CID_COLORFX:
+        case V4L2_CID_AUTO_N_PRESET_WHITE_BALANCE:
         case V4L2_CID_TUNE_PREEMPHASIS:
         case V4L2_CID_FLASH_LED_MODE:
         case V4L2_CID_FLASH_STROBE_SOURCE: