Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 330739
b: refs/heads/master
c: 13eaaa7
h: refs/heads/master
i:
  330737: b2145af
  330735: c23b354
v: v3
  • Loading branch information
Peter Meerwald authored and Mauro Carvalho Chehab committed Aug 11, 2012
1 parent e53dd82 commit b786c4e
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 96d62ae2dced8ec29d3fc985ff15505a65256906
refs/heads/master: 13eaaa7f2fa1d2bd247d68792bf187239a24a33f
4 changes: 2 additions & 2 deletions trunk/drivers/media/video/omap3isp/ispccdc.c
Original file line number Diff line number Diff line change
Expand Up @@ -835,7 +835,7 @@ static void ccdc_config_vp(struct isp_ccdc_device *ccdc)
case 13:
fmtcfg_vp |= ISPCCDC_FMTCFG_VPIN_12_3;
break;
};
}

if (pipe->input)
div = DIV_ROUND_UP(l3_ick, pipe->max_rate);
Expand Down Expand Up @@ -991,7 +991,7 @@ static void ccdc_config_sync_if(struct isp_ccdc_device *ccdc,
case 12:
syn_mode |= ISPCCDC_SYN_MODE_DATSIZ_12;
break;
};
}

if (syncif->fldmode)
syn_mode |= ISPCCDC_SYN_MODE_FLDMODE;
Expand Down

0 comments on commit b786c4e

Please sign in to comment.