diff options
| author | Martin Bugge <marbugge@cisco.com> | 2014-01-29 06:50:20 -0300 |
|---|---|---|
| committer | Chanho Park <chanho61.park@samsung.com> | 2014-11-18 11:55:32 +0900 |
| commit | f773e87d27324b1fca7b4372deae4c82c0530892 (patch) | |
| tree | 958eb210dfef22cbb15b2df6cf5745e0908d0326 | |
| parent | d86ec45492e11c11ba1dfb87ed5d98ed8b9b63ac (diff) | |
| download | linux-3.10-f773e87d27324b1fca7b4372deae4c82c0530892.tar.gz linux-3.10-f773e87d27324b1fca7b4372deae4c82c0530892.tar.bz2 linux-3.10-f773e87d27324b1fca7b4372deae4c82c0530892.zip | |
upstream: [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>
| -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 e22434329ec..c8d0f1d9a96 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 */ |