media: i2c: alvium: Move V4L2_CID_GAIN to V4L2_CID_ANALOG_GAIN
commit a50a2a3242f35dd551d89a6bad17255a410ba955 upstream. Into alvium cameras REG_BCRM_GAIN_RW control the analog gain. Let's use the right V4L2_CID_ANALOGUE_GAIN ctrl. Fixes: 0a7af872915e ("media: i2c: Add support for alvium camera") Cc: stable@vger.kernel.org Signed-off-by: Tommaso Merciai <tomm.merciai@gmail.com> Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com> Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
08e5adac54
commit
7b17fbfe4f
@ -1962,7 +1962,7 @@ static int alvium_g_volatile_ctrl(struct v4l2_ctrl *ctrl)
|
||||
int val;
|
||||
|
||||
switch (ctrl->id) {
|
||||
case V4L2_CID_GAIN:
|
||||
case V4L2_CID_ANALOGUE_GAIN:
|
||||
val = alvium_get_gain(alvium);
|
||||
if (val < 0)
|
||||
return val;
|
||||
@ -1994,7 +1994,7 @@ static int alvium_s_ctrl(struct v4l2_ctrl *ctrl)
|
||||
return 0;
|
||||
|
||||
switch (ctrl->id) {
|
||||
case V4L2_CID_GAIN:
|
||||
case V4L2_CID_ANALOGUE_GAIN:
|
||||
ret = alvium_set_ctrl_gain(alvium, ctrl->val);
|
||||
break;
|
||||
case V4L2_CID_AUTOGAIN:
|
||||
@ -2123,7 +2123,7 @@ static int alvium_ctrl_init(struct alvium_dev *alvium)
|
||||
|
||||
if (alvium->avail_ft.gain) {
|
||||
ctrls->gain = v4l2_ctrl_new_std(hdl, ops,
|
||||
V4L2_CID_GAIN,
|
||||
V4L2_CID_ANALOGUE_GAIN,
|
||||
alvium->min_gain,
|
||||
alvium->max_gain,
|
||||
alvium->inc_gain,
|
||||
|
Loading…
x
Reference in New Issue
Block a user