soc-camera: mt9m111: Fix auto-exposure control
PATCH 1/1 soc-camera: mt9m111: Fix auto-exposure control
Commit f9bd5843658e18a7097fc7258c60fb840109eaa8 changed V4L2_CID_EXPOSURE_AUTO from boolean to enum, and commit af8425c54beb3c32cbb503a379132b3975535289 changed the creation of this control into a menu for the mt9m111. However, mt9m111_set_autoexposure() is still interpreting the value set for this control as a boolean, which also conflicts with the default value of this control set to V4L2_EXPOSURE_AUTO (0).
This patch makes mt9m111_set_autoexposure() interpret the value set for V4L2_CID_EXPOSURE_AUTO as defined by enum v4l2_exposure_auto_type.
--- drivers/media/i2c/soc_camera/mt9m111.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/media/i2c/soc_camera/mt9m111.c +2 -2
@@ -701,11 +701,11 @@ static int mt9m111_set_global_gain(struct mt9m111 *mt9m111, int gain)return reg_write (GLOBAL_GAIN , val); } -static int mt9m111_set_autoexposure (struct mt9m111 *mt9m111,int on) +static int mt9m111_set_autoexposure (struct mt9m111 *mt9m111,int val) {struct i2c_client *client =v4l2_get_subdevdata (&mt9m111->subdev); -if (on) +if (val ==V4L2_EXPOSURE_AUTO )return reg_set (OPER_MODE_CTRL ,MT9M111_OPMODE_AUTOEXPO_EN );return reg_clear (OPER_MODE_CTRL ,MT9M111_OPMODE_AUTOEXPO_EN ); }
Signature · 1 line
1.7.10.4
Hi,
Quoted 37 lines · Benoît Thébaudeau
Commit
f9bd5843658e18a7097fc7258c60fb840109eaa8changedV4L2_CID_EXPOSURE_AUTOfrom boolean to enum, and commitaf8425c54beb3c32cbb503a379132b3975535289changed the creation of this control into a menu for the mt9m111. However,mt9m111_set_autoexposure()is still interpreting the value set for this control as a boolean, which also conflicts with the default value of this control set toV4L2_EXPOSURE_AUTO(0).This patch makes
mt9m111_set_autoexposure()interpret the value set forV4L2_CID_EXPOSURE_AUTOas defined by enumv4l2_exposure_auto_type.Cc Guennadi Liakhovetski <[email protected]>Cc Mickaël Guivarc'h <[email protected]>Cc <[email protected]>Signed-off-by Benoît Thébaudeau <[email protected]>--- drivers/media/i2c/soc_camera/mt9m111.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/media/i2c/soc_camera/mt9m111.c +2
-3@@ -701,11 +701,11 @@ static int mt9m111_set_global_gain(struct mt9m111 *mt9m111, int gain)return reg_write (GLOBAL_GAIN , val); } -static int mt9m111_set_autoexposure (struct mt9m111 *mt9m111,int on) +static int mt9m111_set_autoexposure (struct mt9m111 *mt9m111,int val) {struct i2c_client *client =v4l2_get_subdevdata (&mt9m111->subdev); -if (on) +if (val ==V4L2_EXPOSURE_AUTO )return reg_set (OPER_MODE_CTRL ,MT9M111_OPMODE_AUTOEXPO_EN );return reg_clear (OPER_MODE_CTRL ,MT9M111_OPMODE_AUTOEXPO_EN ); } --
Quoted 1 line
1.7.10.4
This solves a real issue.
Signature · 7 lines
Javier Martin Vista Silicon S.L. CDTUC - FASE C - Oficina S-345 Avda de los Castros s/n 39005- Santander. Cantabria. Spain +34 942 25 32 60 www.vista-silicon.com
Quoted 45 lines · javier Martin
Hi,
Quoted 37 lines · Benoît Thébaudeau
Commit
f9bd5843658e18a7097fc7258c60fb840109eaa8changedV4L2_CID_EXPOSURE_AUTOfrom boolean to enum, and commitaf8425c54beb3c32cbb503a379132b3975535289changed the creation of this control into a menu for the mt9m111. However,mt9m111_set_autoexposure()is still interpreting the value set for this control as a boolean, which also conflicts with the default value of this control set toV4L2_EXPOSURE_AUTO(0).This patch makes
mt9m111_set_autoexposure()interpret the value set forV4L2_CID_EXPOSURE_AUTOas defined by enumv4l2_exposure_auto_type.Cc Guennadi Liakhovetski <[email protected]>Cc Mickaël Guivarc'h <[email protected]>Cc <[email protected]>Signed-off-by Benoît Thébaudeau <[email protected]>--- drivers/media/i2c/soc_camera/mt9m111.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/media/i2c/soc_camera/mt9m111.c +2
-3@@ -701,11 +701,11 @@ static int mt9m111_set_global_gain(struct mt9m111 *mt9m111, int gain)return reg_write (GLOBAL_GAIN , val); } -static int mt9m111_set_autoexposure (struct mt9m111 *mt9m111,int on) +static int mt9m111_set_autoexposure (struct mt9m111 *mt9m111,int val) {struct i2c_client *client =v4l2_get_subdevdata (&mt9m111->subdev); -if (on) +if (val ==V4L2_EXPOSURE_AUTO )return reg_set (OPER_MODE_CTRL ,MT9M111_OPMODE_AUTOEXPO_EN );return reg_clear (OPER_MODE_CTRL ,MT9M111_OPMODE_AUTOEXPO_EN ); } --Quoted 1 line
1.7.10.4
This solves a real issue.
Quoted 1 line
Tested-by Javier Martin <[email protected]>
Thanks, will push to 3.9 + stable.
Guennadi
---
Guennadi Liakhovetski, Ph.D.
Freelance Open-Source Software Developer
http://www.open-technology.de/