From f2d51913cbb74aa8973736ca68e16426307234d8 Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Mon, 17 Dec 2012 04:52:48 -0300 Subject: [PATCH] --- yaml --- r: 357199 b: refs/heads/master c: e19bc863f1f45223a85935f070177eda6b422f8f h: refs/heads/master i: 357197: 3adb94f1251428cee3044cf43cd0ffb97d51b387 357195: 39dd3853cb7427f81f09f7184ff4b70c565e1e87 357191: 1af77f5a7ff19d9dd31c8388d51d44999c744ac5 357183: f580142959c2e8aacd6e8c6613daf36c8a5d135e v: v3 --- [refs] | 2 +- trunk/drivers/media/platform/omap3isp/ispqueue.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index ee75f3851c11..084234210201 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 36a495a336c3fbbb2f4eeed2a94ab6d5be19d186 +refs/heads/master: e19bc863f1f45223a85935f070177eda6b422f8f diff --git a/trunk/drivers/media/platform/omap3isp/ispqueue.c b/trunk/drivers/media/platform/omap3isp/ispqueue.c index 6599963cdd9b..e15f01342058 100644 --- a/trunk/drivers/media/platform/omap3isp/ispqueue.c +++ b/trunk/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 @@ static int isp_video_buffer_prepare_pfnmap(struct isp_video_buffer *buf) 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;