aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/media/usb/uvc/uvc_queue.c4
-rw-r--r--drivers/media/usb/uvc/uvc_v4l2.c2
-rw-r--r--drivers/media/usb/uvc/uvcvideo.h2
3 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/usb/uvc/uvc_queue.c b/drivers/media/usb/uvc/uvc_queue.c
index 708478f958e9..5c11de0df4b6 100644
--- a/drivers/media/usb/uvc/uvc_queue.c
+++ b/drivers/media/usb/uvc/uvc_queue.c
@@ -205,8 +205,8 @@ void uvc_queue_release(struct uvc_video_queue *queue)
205 * V4L2 queue operations 205 * V4L2 queue operations
206 */ 206 */
207 207
208int uvc_alloc_buffers(struct uvc_video_queue *queue, 208int uvc_request_buffers(struct uvc_video_queue *queue,
209 struct v4l2_requestbuffers *rb) 209 struct v4l2_requestbuffers *rb)
210{ 210{
211 int ret; 211 int ret;
212 212
diff --git a/drivers/media/usb/uvc/uvc_v4l2.c b/drivers/media/usb/uvc/uvc_v4l2.c
index 1b6b6db30d98..5ba023be3926 100644
--- a/drivers/media/usb/uvc/uvc_v4l2.c
+++ b/drivers/media/usb/uvc/uvc_v4l2.c
@@ -690,7 +690,7 @@ static int uvc_ioctl_reqbufs(struct file *file, void *fh,
690 return ret; 690 return ret;
691 691
692 mutex_lock(&stream->mutex); 692 mutex_lock(&stream->mutex);
693 ret = uvc_alloc_buffers(&stream->queue, rb); 693 ret = uvc_request_buffers(&stream->queue, rb);
694 mutex_unlock(&stream->mutex); 694 mutex_unlock(&stream->mutex);
695 if (ret < 0) 695 if (ret < 0)
696 return ret; 696 return ret;
diff --git a/drivers/media/usb/uvc/uvcvideo.h b/drivers/media/usb/uvc/uvcvideo.h
index 344aedec9dfb..2dc247a0ce34 100644
--- a/drivers/media/usb/uvc/uvcvideo.h
+++ b/drivers/media/usb/uvc/uvcvideo.h
@@ -624,7 +624,7 @@ extern struct uvc_entity *uvc_entity_by_id(struct uvc_device *dev, int id);
624extern int uvc_queue_init(struct uvc_video_queue *queue, 624extern int uvc_queue_init(struct uvc_video_queue *queue,
625 enum v4l2_buf_type type, int drop_corrupted); 625 enum v4l2_buf_type type, int drop_corrupted);
626extern void uvc_queue_release(struct uvc_video_queue *queue); 626extern void uvc_queue_release(struct uvc_video_queue *queue);
627extern int uvc_alloc_buffers(struct uvc_video_queue *queue, 627extern int uvc_request_buffers(struct uvc_video_queue *queue,
628 struct v4l2_requestbuffers *rb); 628 struct v4l2_requestbuffers *rb);
629extern int uvc_query_buffer(struct uvc_video_queue *queue, 629extern int uvc_query_buffer(struct uvc_video_queue *queue,
630 struct v4l2_buffer *v4l2_buf); 630 struct v4l2_buffer *v4l2_buf);