diff options
Diffstat (limited to 'drivers/media/platform/omap3isp/ispqueue.c')
| -rw-r--r-- | drivers/media/platform/omap3isp/ispqueue.c | 5 | 
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/media/platform/omap3isp/ispqueue.c b/drivers/media/platform/omap3isp/ispqueue.c index 15bf3eab222..e15f0134205 100644 --- a/drivers/media/platform/omap3isp/ispqueue.c +++ b/drivers/media/platform/omap3isp/ispqueue.c @@ -366,7 +366,7 @@ static int isp_video_buffer_prepare_pfnmap(struct isp_video_buffer *buf)  	unsigned long this_pfn;  	unsigned long start;  	unsigned long end; -	dma_addr_t pa; +	dma_addr_t pa = 0;  	int ret = -EFAULT;  	start = buf->vbuf.m.userptr; @@ -419,7 +419,7 @@ done:  static int isp_video_buffer_prepare_vm_flags(struct isp_video_buffer *buf)  {  	struct vm_area_struct *vma; -	pgprot_t vm_page_prot; +	pgprot_t uninitialized_var(vm_page_prot);  	unsigned long start;  	unsigned long end;  	int ret = -EFAULT; @@ -674,6 +674,7 @@ static int isp_video_queue_alloc(struct isp_video_queue *queue,  		buf->vbuf.index = i;  		buf->vbuf.length = size;  		buf->vbuf.type = queue->type; +		buf->vbuf.flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;  		buf->vbuf.field = V4L2_FIELD_NONE;  		buf->vbuf.memory = memory;  |