Merge tag 'media/v4.20-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

[platform/kernel/linux-starfive.git] / drivers / media / platform / vivid / vivid-ctrls.c

diff --git a/drivers/media/platform/vivid/vivid-ctrls.c b/drivers/media/platform/vivid/vivid-ctrls.c
index 5655f39..bfffeda 100644 (file)
--- a/drivers/media/platform/vivid/vivid-ctrls.c
+++ b/drivers/media/platform/vivid/vivid-ctrls.c
@@ -348,7 +348,7 @@ static int vivid_vid_cap_s_ctrl(struct v4l2_ctrl *ctrl)
                V4L2_COLORSPACE_SMPTE170M,
                V4L2_COLORSPACE_REC709,
                V4L2_COLORSPACE_SRGB,
-               V4L2_COLORSPACE_ADOBERGB,
+               V4L2_COLORSPACE_OPRGB,
                V4L2_COLORSPACE_BT2020,
                V4L2_COLORSPACE_DCI_P3,
                V4L2_COLORSPACE_SMPTE240M,
@@ -729,7 +729,7 @@ static const char * const vivid_ctrl_colorspace_strings[] = {
        "SMPTE 170M",
        "Rec. 709",
        "sRGB",
-       "AdobeRGB",
+       "opRGB",
        "BT.2020",
        "DCI-P3",
        "SMPTE 240M",
@@ -752,7 +752,7 @@ static const char * const vivid_ctrl_xfer_func_strings[] = {
        "Default",
        "Rec. 709",
        "sRGB",
-       "AdobeRGB",
+       "opRGB",
        "SMPTE 240M",
        "None",
        "DCI-P3",