[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-id: <54DB3264.9080702@samsung.com>
Date: Wed, 11 Feb 2015 11:43:48 +0100
From: Marek Szyprowski <m.szyprowski@...sung.com>
To: Ricardo Ribalda Delgado <ricardo.ribalda@...il.com>,
Pawel Osciak <pawel@...iak.com>,
Kyungmin Park <kyungmin.park@...sung.com>,
Mauro Carvalho Chehab <mchehab@....samsung.com>,
linux-media@...r.kernel.org, linux-kernel@...r.kernel.org,
Hans Verkuil <hans.verkuil@...co.com>
Subject: Re: [PATCH v2 3/3] media/videobuf2-dma-vmalloc: Save output from
dma_map_sg
Hello,
On 2015-02-11 11:33, Ricardo Ribalda Delgado wrote:
> dma_map_sg returns the number of areas mapped by the hardware,
> which could be different than the areas given as an input.
> The output must be saved to nent.
>
> Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@...il.com>
Reviewed-by: Marek Szyprowski <m.szyprowski@...sung.com>
> ---
> drivers/media/v4l2-core/videobuf2-vmalloc.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/media/v4l2-core/videobuf2-vmalloc.c b/drivers/media/v4l2-core/videobuf2-vmalloc.c
> index bcde885..f92bc9e 100644
> --- a/drivers/media/v4l2-core/videobuf2-vmalloc.c
> +++ b/drivers/media/v4l2-core/videobuf2-vmalloc.c
> @@ -287,7 +287,6 @@ static struct sg_table *vb2_vmalloc_dmabuf_ops_map(
> /* stealing dmabuf mutex to serialize map/unmap operations */
> struct mutex *lock = &db_attach->dmabuf->lock;
> struct sg_table *sgt;
> - int ret;
>
> mutex_lock(lock);
>
> @@ -306,8 +305,9 @@ static struct sg_table *vb2_vmalloc_dmabuf_ops_map(
> }
>
> /* mapping to the client with new direction */
> - ret = dma_map_sg(db_attach->dev, sgt->sgl, sgt->orig_nents, dma_dir);
> - if (ret <= 0) {
> + sgt->nents = dma_map_sg(db_attach->dev, sgt->sgl, sgt->orig_nents,
> + dma_dir);
> + if (!sgt->nents) {
> pr_err("failed to map scatterlist\n");
> mutex_unlock(lock);
> return ERR_PTR(-EIO);
Best regards
--
Marek Szyprowski, PhD
Samsung R&D Institute Poland
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists