commit: http://blackfin.uclinux.org/git/?p=linux-kernel;a=commitdiff;h=e0e12f152f09a3900084c388a7e2e003a46c2249 branch: http://blackfin.uclinux.org/git/?p=linux-kernel;a=shortlog;h=refs/heads/2012R1
Fix uvc_v4l2_get_unmapped_area() for NOMMU arch like blackfin after framework updated to use videobuf2. Signed-off-by: Bob Liu <[email protected]> --- drivers/media/video/uvc/uvc_queue.c | 30 ------------------------------ drivers/media/video/uvc/uvc_v4l2.c | 2 +- 2 files changed, 1 insertions(+), 31 deletions(-) diff --git a/drivers/media/video/uvc/uvc_queue.c b/drivers/media/video/uvc/uvc_queue.c index 518f77d..30be060 100644 --- a/drivers/media/video/uvc/uvc_queue.c +++ b/drivers/media/video/uvc/uvc_queue.c @@ -237,36 +237,6 @@ int uvc_queue_allocated(struct uvc_video_queue *queue) return allocated; } -#ifndef CONFIG_MMU -/* - * Get unmapped area. - * - * NO-MMU arch need this function to make mmap() work correctly. - */ -unsigned long uvc_queue_get_unmapped_area(struct uvc_video_queue *queue, - unsigned long pgoff) -{ - struct uvc_buffer *buffer; - unsigned int i; - unsigned long ret; - - mutex_lock(&queue->mutex); - for (i = 0; i < queue->count; ++i) { - buffer = &queue->buffer[i]; - if ((buffer->buf.m.offset >> PAGE_SHIFT) == pgoff) - break; - } - if (i == queue->count) { - ret = -EINVAL; - goto done; - } - ret = (unsigned long)buf->mem; -done: - mutex_unlock(&queue->mutex); - return ret; -} -#endif - /* * Enable or disable the video buffers queue. * diff --git a/drivers/media/video/uvc/uvc_v4l2.c b/drivers/media/video/uvc/uvc_v4l2.c index 2ae4f88..506d3d6 100644 --- a/drivers/media/video/uvc/uvc_v4l2.c +++ b/drivers/media/video/uvc/uvc_v4l2.c @@ -1067,7 +1067,7 @@ static unsigned long uvc_v4l2_get_unmapped_area(struct file *file, uvc_trace(UVC_TRACE_CALLS, "uvc_v4l2_get_unmapped_area\n"); - return uvc_queue_get_unmapped_area(&stream->queue, pgoff); + return vb2_get_unmapped_area(&stream->queue, addr, len, pgoff, flags); } #endif
_______________________________________________ Linux-kernel-commits mailing list [email protected] https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
