Loading drivers/media/video/mt9m111.c +18 −16 Original line number Diff line number Diff line Loading @@ -226,7 +226,6 @@ struct mt9m111 { const struct mt9m111_datafmt *fmt; int lastpage; /* PageMap cache value */ unsigned char datawidth; unsigned int powered:1; }; static struct mt9m111 *to_mt9m111(const struct i2c_client *client) Loading Loading @@ -360,12 +359,7 @@ static int mt9m111_setup_rect(struct mt9m111 *mt9m111, static int mt9m111_enable(struct mt9m111 *mt9m111) { struct i2c_client *client = v4l2_get_subdevdata(&mt9m111->subdev); int ret; ret = reg_set(RESET, MT9M111_RESET_CHIP_ENABLE); if (!ret) mt9m111->powered = 1; return ret; return reg_write(RESET, MT9M111_RESET_CHIP_ENABLE); } static int mt9m111_reset(struct mt9m111 *mt9m111) Loading Loading @@ -751,9 +745,20 @@ static int mt9m111_s_ctrl(struct v4l2_ctrl *ctrl) static int mt9m111_suspend(struct mt9m111 *mt9m111) { struct i2c_client *client = v4l2_get_subdevdata(&mt9m111->subdev); int ret; v4l2_ctrl_s_ctrl(mt9m111->gain, mt9m111_get_global_gain(mt9m111)); return 0; ret = reg_set(RESET, MT9M111_RESET_RESET_MODE); if (!ret) ret = reg_set(RESET, MT9M111_RESET_RESET_SOC | MT9M111_RESET_OUTPUT_DISABLE | MT9M111_RESET_ANALOG_STANDBY); if (!ret) ret = reg_clear(RESET, MT9M111_RESET_CHIP_ENABLE); return ret; } static void mt9m111_restore_state(struct mt9m111 *mt9m111) Loading @@ -766,15 +771,12 @@ static void mt9m111_restore_state(struct mt9m111 *mt9m111) static int mt9m111_resume(struct mt9m111 *mt9m111) { int ret = 0; if (mt9m111->powered) { ret = mt9m111_enable(mt9m111); int ret = mt9m111_enable(mt9m111); if (!ret) ret = mt9m111_reset(mt9m111); if (!ret) mt9m111_restore_state(mt9m111); } return ret; } Loading Loading
drivers/media/video/mt9m111.c +18 −16 Original line number Diff line number Diff line Loading @@ -226,7 +226,6 @@ struct mt9m111 { const struct mt9m111_datafmt *fmt; int lastpage; /* PageMap cache value */ unsigned char datawidth; unsigned int powered:1; }; static struct mt9m111 *to_mt9m111(const struct i2c_client *client) Loading Loading @@ -360,12 +359,7 @@ static int mt9m111_setup_rect(struct mt9m111 *mt9m111, static int mt9m111_enable(struct mt9m111 *mt9m111) { struct i2c_client *client = v4l2_get_subdevdata(&mt9m111->subdev); int ret; ret = reg_set(RESET, MT9M111_RESET_CHIP_ENABLE); if (!ret) mt9m111->powered = 1; return ret; return reg_write(RESET, MT9M111_RESET_CHIP_ENABLE); } static int mt9m111_reset(struct mt9m111 *mt9m111) Loading Loading @@ -751,9 +745,20 @@ static int mt9m111_s_ctrl(struct v4l2_ctrl *ctrl) static int mt9m111_suspend(struct mt9m111 *mt9m111) { struct i2c_client *client = v4l2_get_subdevdata(&mt9m111->subdev); int ret; v4l2_ctrl_s_ctrl(mt9m111->gain, mt9m111_get_global_gain(mt9m111)); return 0; ret = reg_set(RESET, MT9M111_RESET_RESET_MODE); if (!ret) ret = reg_set(RESET, MT9M111_RESET_RESET_SOC | MT9M111_RESET_OUTPUT_DISABLE | MT9M111_RESET_ANALOG_STANDBY); if (!ret) ret = reg_clear(RESET, MT9M111_RESET_CHIP_ENABLE); return ret; } static void mt9m111_restore_state(struct mt9m111 *mt9m111) Loading @@ -766,15 +771,12 @@ static void mt9m111_restore_state(struct mt9m111 *mt9m111) static int mt9m111_resume(struct mt9m111 *mt9m111) { int ret = 0; if (mt9m111->powered) { ret = mt9m111_enable(mt9m111); int ret = mt9m111_enable(mt9m111); if (!ret) ret = mt9m111_reset(mt9m111); if (!ret) mt9m111_restore_state(mt9m111); } return ret; } Loading