From: Martin Bugge Date: Wed, 29 Jan 2014 09:50:20 +0000 (-0300) Subject: [media] adv7842: Composite free-run platfrom-data fix X-Git-Tag: v3.14-rc2~14^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=57f0547fbc1e925f5e58c76f311a6632c3f37740;p=profile%2Fivi%2Fkernel-x86-ivi.git [media] adv7842: Composite free-run platfrom-data fix Incorrectly setting of free-run for Composite. Copy/paste regression fix. Signed-off-by: Martin Bugge Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/i2c/adv7842.c b/drivers/media/i2c/adv7842.c index 1effc21..9bbd665 100644 --- a/drivers/media/i2c/adv7842.c +++ b/drivers/media/i2c/adv7842.c @@ -2554,7 +2554,7 @@ static int adv7842_core_init(struct v4l2_subdev *sd) sdp_write_and_or(sd, 0xdd, 0xf0, pdata->sdp_free_run_force | (pdata->sdp_free_run_cbar_en << 1) | (pdata->sdp_free_run_man_col_en << 2) | - (pdata->sdp_free_run_force << 3)); + (pdata->sdp_free_run_auto << 3)); /* TODO from platform data */ cp_write(sd, 0x69, 0x14); /* Enable CP CSC */