diff options
| author | Andrey Konovalov <andrey.konovalov@linaro.org> | 2012-05-22 20:39:24 +0400 |
|---|---|---|
| committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2012-05-22 20:39:24 +0400 |
| commit | 3f30472334c25b2ab58b9cb2e84e58b13eb5daae (patch) | |
| tree | fbb2a68f8950b0e0b64e895ae9aabaed81d4c3ee | |
| parent | 826ecd291fbe2e5ab8145ecc7630c917058b2402 (diff) | |
| parent | c579b4d6b17a6fb1b15cc681268db54e5b73afaf (diff) | |
Merge branch 'rebase-umm_fixes' into merge-linux-linaro
| -rw-r--r-- | drivers/media/video/videobuf2-dma-contig.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/media/video/videobuf2-dma-contig.c b/drivers/media/video/videobuf2-dma-contig.c index 266ae7d6df2b..57e643bb4ff7 100644 --- a/drivers/media/video/videobuf2-dma-contig.c +++ b/drivers/media/video/videobuf2-dma-contig.c @@ -273,6 +273,9 @@ static struct vm_area_struct *vb2_dc_get_user_vma( static int vb2_dc_get_user_pages(unsigned long start, struct page **pages, int n_pages, struct vm_area_struct *vma, int write) { + if (vma->vm_mm == NULL) + vma->vm_mm = current->mm; + if (vma_is_io(vma)) { unsigned int i; |