aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>2014-01-02 08:10:28 -0500
committerMauro Carvalho Chehab <m.chehab@samsung.com>2014-05-25 10:06:49 -0400
commit512698605dac47f1745dee435f2e3b9bc3346c2d (patch)
tree0f12bd4daf359fe1f7d7cb4d75b77c99ea8213d0 /drivers/media
parent63746b5ff12a9ac64bd88a45b01b36e86f068d51 (diff)
[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')
-rw-r--r--drivers/media/platform/omap3isp/ispstat.c2
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)
400 struct ispstat_buffer *buf = &stat->buf[i]; 400 struct ispstat_buffer *buf = &stat->buf[i];
401 struct iovm_struct *iovm; 401 struct iovm_struct *iovm;
402 402
403 WARN_ON(buf->dma_addr);
404 buf->iommu_addr = omap_iommu_vmalloc(isp->domain, isp->dev, 0, 403 buf->iommu_addr = omap_iommu_vmalloc(isp->domain, isp->dev, 0,
405 size, IOMMU_FLAG); 404 size, IOMMU_FLAG);
406 if (IS_ERR((void *)buf->iommu_addr)) { 405 if (IS_ERR((void *)buf->iommu_addr)) {
@@ -441,7 +440,6 @@ static int isp_stat_bufs_alloc_dma(struct ispstat *stat, unsigned int size)
441 for (i = 0; i < STAT_MAX_BUFS; i++) { 440 for (i = 0; i < STAT_MAX_BUFS; i++) {
442 struct ispstat_buffer *buf = &stat->buf[i]; 441 struct ispstat_buffer *buf = &stat->buf[i];
443 442
444 WARN_ON(buf->iommu_addr);
445 buf->virt_addr = dma_alloc_coherent(stat->isp->dev, size, 443 buf->virt_addr = dma_alloc_coherent(stat->isp->dev, size,
446 &buf->dma_addr, GFP_KERNEL | GFP_DMA); 444 &buf->dma_addr, GFP_KERNEL | GFP_DMA);
447 445