From: Marek Szyprowski <m.szyprowski@samsung.com>
Date: Wed, 19 Jun 2013 11:56:46 +0000 (-0300)
Subject: [media] videobuf2-dc: Fix support for mappings without struct page in userptr mode
X-Git-Tag: v3.12-rc7~18^2~7
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=774d23010f6a7d7d299552f0b1edfbe1ec82c5e7;p=pandora-kernel.git

[media] videobuf2-dc: Fix support for mappings without struct page in userptr mode

Earlier version of dma-contig allocator in user ptr mode assumed that in
all cases DMA address equals physical address. This was just a special case.
Commit e15dab752d4c588544ccabdbe020a7cc092e23c8 introduced correct support
for converting userpage to dma address, but unfortunately it broke the
support for simple dma address = physical address for the case, when given
physical frame has no struct page associated with it (this happens if one
use for example dma_declare_coherent api or other reserved memory approach).
This commit restores support for such cases.

Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
[s.nawrocki@samsung.com: replaced #elsif with #elif]
Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>

Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
---

Reading git-diff-tree failed