From 66d6664e8a62ff76e18284c3addb88e4bce986db Mon Sep 17 00:00:00 2001 From: Devin Heitmueller Date: Thu, 11 Mar 2010 22:00:13 -0300 Subject: [PATCH] --- yaml --- r: 192840 b: refs/heads/master c: f1a4f9eab2bac10d3145d75342eb372c0ef9f125 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/video/saa7115.c | 11 +---------- trunk/drivers/media/video/v4l2-common.c | 2 ++ 3 files changed, 4 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index 90d4ca1dd81e..425ce6187990 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 87a6fe4a530cc01081d19cdec4738433972fb0ee +refs/heads/master: f1a4f9eab2bac10d3145d75342eb372c0ef9f125 diff --git a/trunk/drivers/media/video/saa7115.c b/trunk/drivers/media/video/saa7115.c index f96071c66055..72eaa662b66f 100644 --- a/trunk/drivers/media/video/saa7115.c +++ b/trunk/drivers/media/video/saa7115.c @@ -1234,16 +1234,7 @@ static int saa711x_queryctrl(struct v4l2_subdev *sd, struct v4l2_queryctrl *qc) case V4L2_CID_CHROMA_AGC: return v4l2_ctrl_query_fill(qc, 0, 1, 1, 1); case V4L2_CID_CHROMA_GAIN: - qc->type = V4L2_CTRL_TYPE_INTEGER; - qc->flags = V4L2_CTRL_FLAG_SLIDER; - qc->minimum = 0; - qc->maximum = 127; - qc->step = 1; - qc->default_value = 0x30; - qc->reserved[0] = 0; - qc->reserved[1] = 0; - strlcpy(qc->name, "chroma_gain", sizeof(qc->name)); - return 0; + return v4l2_ctrl_query_fill(qc, 0, 127, 1, 48); default: return -EINVAL; } diff --git a/trunk/drivers/media/video/v4l2-common.c b/trunk/drivers/media/video/v4l2-common.c index e67983461008..6a3d0b71f78f 100644 --- a/trunk/drivers/media/video/v4l2-common.c +++ b/trunk/drivers/media/video/v4l2-common.c @@ -429,6 +429,7 @@ const char *v4l2_ctrl_get_name(u32 id) case V4L2_CID_SHARPNESS: return "Sharpness"; case V4L2_CID_BACKLIGHT_COMPENSATION: return "Backlight Compensation"; case V4L2_CID_CHROMA_AGC: return "Chroma AGC"; + case V4L2_CID_CHROMA_GAIN: return "Chroma Gain"; case V4L2_CID_COLOR_KILLER: return "Color Killer"; case V4L2_CID_COLORFX: return "Color Effects"; case V4L2_CID_AUTOBRIGHTNESS: return "Brightness, Automatic"; @@ -622,6 +623,7 @@ int v4l2_ctrl_query_fill(struct v4l2_queryctrl *qctrl, s32 min, s32 max, s32 ste case V4L2_CID_BLUE_BALANCE: case V4L2_CID_GAMMA: case V4L2_CID_SHARPNESS: + case V4L2_CID_CHROMA_GAIN: case V4L2_CID_RDS_TX_DEVIATION: case V4L2_CID_AUDIO_LIMITER_RELEASE_TIME: case V4L2_CID_AUDIO_LIMITER_DEVIATION: