diff options
Diffstat (limited to 'drivers/media/common/saa7146_hlp.c')
-rw-r--r-- | drivers/media/common/saa7146_hlp.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/drivers/media/common/saa7146_hlp.c b/drivers/media/common/saa7146_hlp.c index 1d1d8d200755..79ad73accb27 100644 --- a/drivers/media/common/saa7146_hlp.c +++ b/drivers/media/common/saa7146_hlp.c | |||
@@ -1,3 +1,5 @@ | |||
1 | #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt | ||
2 | |||
1 | #include <linux/kernel.h> | 3 | #include <linux/kernel.h> |
2 | #include <media/saa7146_vv.h> | 4 | #include <media/saa7146_vv.h> |
3 | 5 | ||
@@ -711,8 +713,8 @@ static int calculate_video_dma_grab_packed(struct saa7146_dev* dev, struct saa71 | |||
711 | 713 | ||
712 | int depth = sfmt->depth; | 714 | int depth = sfmt->depth; |
713 | 715 | ||
714 | DEB_CAP(("[size=%dx%d,fields=%s]\n", | 716 | DEB_CAP("[size=%dx%d,fields=%s]\n", |
715 | width,height,v4l2_field_names[field])); | 717 | width, height, v4l2_field_names[field]); |
716 | 718 | ||
717 | if( bytesperline != 0) { | 719 | if( bytesperline != 0) { |
718 | vdma1.pitch = bytesperline*2; | 720 | vdma1.pitch = bytesperline*2; |
@@ -837,8 +839,8 @@ static int calculate_video_dma_grab_planar(struct saa7146_dev* dev, struct saa71 | |||
837 | BUG_ON(0 == buf->pt[1].dma); | 839 | BUG_ON(0 == buf->pt[1].dma); |
838 | BUG_ON(0 == buf->pt[2].dma); | 840 | BUG_ON(0 == buf->pt[2].dma); |
839 | 841 | ||
840 | DEB_CAP(("[size=%dx%d,fields=%s]\n", | 842 | DEB_CAP("[size=%dx%d,fields=%s]\n", |
841 | width,height,v4l2_field_names[field])); | 843 | width, height, v4l2_field_names[field]); |
842 | 844 | ||
843 | /* fixme: look at bytesperline! */ | 845 | /* fixme: look at bytesperline! */ |
844 | 846 | ||
@@ -998,12 +1000,12 @@ void saa7146_set_capture(struct saa7146_dev *dev, struct saa7146_buf *buf, struc | |||
998 | struct saa7146_vv *vv = dev->vv_data; | 1000 | struct saa7146_vv *vv = dev->vv_data; |
999 | u32 vdma1_prot_addr; | 1001 | u32 vdma1_prot_addr; |
1000 | 1002 | ||
1001 | DEB_CAP(("buf:%p, next:%p\n",buf,next)); | 1003 | DEB_CAP("buf:%p, next:%p\n", buf, next); |
1002 | 1004 | ||
1003 | vdma1_prot_addr = saa7146_read(dev, PROT_ADDR1); | 1005 | vdma1_prot_addr = saa7146_read(dev, PROT_ADDR1); |
1004 | if( 0 == vdma1_prot_addr ) { | 1006 | if( 0 == vdma1_prot_addr ) { |
1005 | /* clear out beginning of streaming bit (rps register 0)*/ | 1007 | /* clear out beginning of streaming bit (rps register 0)*/ |
1006 | DEB_CAP(("forcing sync to new frame\n")); | 1008 | DEB_CAP("forcing sync to new frame\n"); |
1007 | saa7146_write(dev, MC2, MASK_27 ); | 1009 | saa7146_write(dev, MC2, MASK_27 ); |
1008 | } | 1010 | } |
1009 | 1011 | ||