| Date | Thu, 07 Jul 2011 17:16:34 -0700 | From | Greg KH <> | Subject | [062/107] [media] uvcvideo: Remove buffers from the queues when freeing |
| |
2.6.39-stable review patch. If anyone has any objections, please let us know.
------------------
From: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
commit 8ca2c80b170c47eeb55f0c2a0f2b8edf85f35d49 upstream.
When freeing memory for the video buffers also remove them from the irq & main queues.
This fixes an oops when doing the following:
open ("/dev/video", ..) VIDIOC_REQBUFS VIDIOC_QBUF VIDIOC_REQBUFS close ()
As the second VIDIOC_REQBUFS will cause the list entries of the buffers to be cleared while they still hang around on the main and irc queues
Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk> Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
--- drivers/media/video/uvc/uvc_queue.c | 2 ++ 1 file changed, 2 insertions(+)
--- a/drivers/media/video/uvc/uvc_queue.c +++ b/drivers/media/video/uvc/uvc_queue.c @@ -104,6 +104,8 @@ static int __uvc_free_buffers(struct uvc } if (queue->count) { + uvc_queue_cancel(queue, 0); + INIT_LIST_HEAD(&queue->mainqueue); vfree(queue->mem); queue->count = 0; }
|