diff options
| author | Paul Cassella <fortytwo-ivtv@manetheren.bigw.org> | 2011-02-08 22:22:52 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-03-21 20:32:33 -0300 |
| commit | 793e71b667856ed6163ad0dc7de1f453e9385590 (patch) | |
| tree | efca87578eb126bca58129e55ee107c72cf63d51 /drivers/media/video/ivtv | |
| parent | e45c2be9704381971d78d711e58dec35b1c4cf6f (diff) | |
| download | linux-793e71b667856ed6163ad0dc7de1f453e9385590.tar.gz linux-793e71b667856ed6163ad0dc7de1f453e9385590.tar.bz2 linux-793e71b667856ed6163ad0dc7de1f453e9385590.zip | |
[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>
Diffstat (limited to 'drivers/media/video/ivtv')
| -rw-r--r-- | drivers/media/video/ivtv/ivtv-udma.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/media/video/ivtv/ivtv-udma.c b/drivers/media/video/ivtv/ivtv-udma.c index 1daf1dd65bf7..69cc8166b20b 100644 --- a/drivers/media/video/ivtv/ivtv-udma.c +++ b/drivers/media/video/ivtv/ivtv-udma.c @@ -132,7 +132,12 @@ 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); - return -EINVAL; + 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; |