diff options
| author | Laurent Pinchart | 2014-01-02 14:10:28 +0100 |
|---|---|---|
| committer | Mauro Carvalho Chehab | 2014-05-25 16:06:49 +0200 |
| commit | 512698605dac47f1745dee435f2e3b9bc3346c2d (patch) | |
| tree | 0f12bd4daf359fe1f7d7cb4d75b77c99ea8213d0 /drivers/media/platform/omap3isp | |
| parent | [media] omap3isp: stat: Rename IS_COHERENT_BUF to ISP_STAT_USES_DMAENGINE (diff) | |
| download | kernel-qcow2-linux-512698605dac47f1745dee435f2e3b9bc3346c2d.tar.gz kernel-qcow2-linux-512698605dac47f1745dee435f2e3b9bc3346c2d.tar.xz kernel-qcow2-linux-512698605dac47f1745dee435f2e3b9bc3346c2d.zip | |
[media] omap3isp: stat: Remove impossible WARN_ON
The WARN_ON statements in the buffer allocation functions try to catch
conditions where buffers would have already been allocated. As the
buffers are explicitly freed right before being allocated this can't
happen.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Sakari Ailus <sakari.ailus@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'drivers/media/platform/omap3isp')
| -rw-r--r-- | drivers/media/platform/omap3isp/ispstat.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/media/platform/omap3isp/ispstat.c b/drivers/media/platform/omap3isp/ispstat.c index 48b702a568e3..c6c1290e738d 100644 --- a/drivers/media/platform/omap3isp/ispstat.c +++ b/drivers/media/platform/omap3isp/ispstat.c @@ -400,7 +400,6 @@ static int isp_stat_bufs_alloc_iommu(struct ispstat *stat, unsigned int size) struct ispstat_buffer *buf = &stat->buf[i]; struct iovm_struct *iovm; - WARN_ON(buf->dma_addr); buf->iommu_addr = omap_iommu_vmalloc(isp->domain, isp->dev, 0, size, IOMMU_FLAG); if (IS_ERR((void *)buf->iommu_addr)) { @@ -441,7 +440,6 @@ static int isp_stat_bufs_alloc_dma(struct ispstat *stat, unsigned int size) for (i = 0; i < STAT_MAX_BUFS; i++) { struct ispstat_buffer *buf = &stat->buf[i]; - WARN_ON(buf->iommu_addr); buf->virt_addr = dma_alloc_coherent(stat->isp->dev, size, &buf->dma_addr, GFP_KERNEL | GFP_DMA); |