Commit 793e71b6 authored Feb 08, 2011 by Paul Cassella Committed by Mauro Carvalho Chehab Mar 21, 2011

[media] ivtv: udma: handle get_user_pages() returning fewer pages than we asked for



get_user_pages() may return fewer page than we ask for.  As we give up and
return an error in this case, we need to put_page() each of the pages we
did get.

[Andy Walls modified the patch, only removing the braces in the 'for'
statement, to eliminate a checkpatch warning.]

Signed-off-by: Paul Cassella <fortytwo-ivtv@manetheren.bigw.org>
Signed-off-by: Andy Walls <awalls@md.metrocast.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

parent e45c2be9

drivers/media/video/ivtv/ivtv-udma.c

+6 −1

Original line number	Diff line number	Diff line
		@@ -132,8 +132,13 @@ int ivtv_udma_setup(struct ivtv *itv, unsigned long ivtv_dest_addr,
		if (user_dma.page_count != err) {
		IVTV_DEBUG_WARN("failed to map user pages, returned %d instead of %d\n",
		err, user_dma.page_count);
		if (err >= 0) {
		for (i = 0; i < err; i++)
		put_page(dma->map[i]);
		return -EINVAL;
		}
		return err;
		}

		dma->page_count = user_dma.page_count;