diff options
author | Martin Bugge <marbugge@cisco.com> | 2014-01-29 06:50:20 -0300 |
---|---|---|
committer | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2014-02-04 06:46:10 -0200 |
commit | 57f0547fbc1e925f5e58c76f311a6632c3f37740 (patch) | |
tree | 905409ea4163f2c66eb654a62296c0bf274ae7a9 /drivers | |
parent | 257cc4b5c57060a65e9c805fb1c225688ebbca80 (diff) | |
download | linux-stable-57f0547fbc1e925f5e58c76f311a6632c3f37740.tar.gz linux-stable-57f0547fbc1e925f5e58c76f311a6632c3f37740.tar.bz2 linux-stable-57f0547fbc1e925f5e58c76f311a6632c3f37740.zip |
[media] adv7842: Composite free-run platfrom-data fix
Incorrectly setting of free-run for Composite.
Copy/paste regression fix.
Signed-off-by: Martin Bugge <marbugge@cisco.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/media/i2c/adv7842.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/i2c/adv7842.c b/drivers/media/i2c/adv7842.c index 1effc21e1cdd..9bbd6656fb8f 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 */ |