| Message ID | 1441972234-8643-10-git-send-email-sakari.ailus@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi Sakari, Thank you for the patch. On Friday 11 Sep 2015 14:50:32 Sakari Ailus wrote: > vb2_dc_get_base_sgt() which obtains the scatterlist already prints > information on why the scatterlist could not be obtained. > > Also, remove the useless warning of a failed kmalloc(). > > Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > --- > drivers/media/v4l2-core/videobuf2-dma-contig.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/drivers/media/v4l2-core/videobuf2-dma-contig.c > b/drivers/media/v4l2-core/videobuf2-dma-contig.c index 3260392..65bc687 > 100644 > --- a/drivers/media/v4l2-core/videobuf2-dma-contig.c > +++ b/drivers/media/v4l2-core/videobuf2-dma-contig.c > @@ -88,10 +88,8 @@ static struct sg_table *vb2_dc_get_base_sgt(struct > vb2_dc_buf *buf) struct sg_table *sgt; > > sgt = kmalloc(sizeof(*sgt), GFP_KERNEL); > - if (!sgt) { > - dev_err(buf->dev, "failed to alloc sg table\n"); > + if (!sgt) > return NULL; > - } > > ret = dma_get_sgtable(buf->dev, sgt, buf->vaddr, buf->dma_addr, > buf->size); > @@ -411,7 +409,7 @@ static struct dma_buf *vb2_dc_get_dmabuf(void *buf_priv, > unsigned long flags) if (!buf->dma_sgt) > buf->dma_sgt = vb2_dc_get_base_sgt(buf); > > - if (WARN_ON(!buf->dma_sgt)) > + if (!buf->dma_sgt) > return NULL; > > dbuf = dma_buf_export(&exp_info);
diff --git a/drivers/media/v4l2-core/videobuf2-dma-contig.c b/drivers/media/v4l2-core/videobuf2-dma-contig.c index 3260392..65bc687 100644 --- a/drivers/media/v4l2-core/videobuf2-dma-contig.c +++ b/drivers/media/v4l2-core/videobuf2-dma-contig.c @@ -88,10 +88,8 @@ static struct sg_table *vb2_dc_get_base_sgt(struct vb2_dc_buf *buf) struct sg_table *sgt; sgt = kmalloc(sizeof(*sgt), GFP_KERNEL); - if (!sgt) { - dev_err(buf->dev, "failed to alloc sg table\n"); + if (!sgt) return NULL; - } ret = dma_get_sgtable(buf->dev, sgt, buf->vaddr, buf->dma_addr, buf->size); @@ -411,7 +409,7 @@ static struct dma_buf *vb2_dc_get_dmabuf(void *buf_priv, unsigned long flags) if (!buf->dma_sgt) buf->dma_sgt = vb2_dc_get_base_sgt(buf); - if (WARN_ON(!buf->dma_sgt)) + if (!buf->dma_sgt) return NULL; dbuf = dma_buf_export(&exp_info);
vb2_dc_get_base_sgt() which obtains the scatterlist already prints information on why the scatterlist could not be obtained. Also, remove the useless warning of a failed kmalloc(). Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com> --- drivers/media/v4l2-core/videobuf2-dma-contig.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)