[media] omap3isp: stat: Remove impossible WARN_ON
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Thu, 2 Jan 2014 13:10:28 +0000 (10:10 -0300)
committerMauro Carvalho Chehab <m.chehab@samsung.com>
Sun, 25 May 2014 14:06:49 +0000 (11:06 -0300)
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>
drivers/media/platform/omap3isp/ispstat.c

index 48b702a568e34f46ebfbd5d8b599c75eda3dd39e..c6c1290e738dcc91fa44d6944472c96342def101 100644 (file)
@@ -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);