diff options
| author | Andrey Konovalov <andrey.konovalov@linaro.org> | 2012-06-22 16:57:28 +0400 |
|---|---|---|
| committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2012-06-22 16:57:28 +0400 |
| commit | b92580f78c5a82a138574365c056c7dc0764f2d3 (patch) | |
| tree | 549e89eed5b86f74c59c0e08e0027a56dbfd392c | |
| parent | 26406d3cbc5826809e47ebf7af4d4861bb532162 (diff) | |
| parent | 1bc2d67f3ff28c3797735a37c2b54b75d47bebb6 (diff) | |
Merge branch 'tracking-llct-last-minute-fixes' into merge-linux-linaro-core-trackingtracking-llct-ll-20120627.0tracking-llct-ll-20120625.0tracking-llct-ll-20120622.0llct-20120622.0
| -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 a84af850d1fe..459c0e2efa9d 100644 --- a/drivers/media/video/videobuf2-dma-contig.c +++ b/drivers/media/video/videobuf2-dma-contig.c @@ -246,6 +246,9 @@ static inline int vma_is_io(struct vm_area_struct *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; |