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;