Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 51269860 authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Mauro Carvalho Chehab
Browse files

[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: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: default avatarSakari Ailus <sakari.ailus@iki.fi>
Signed-off-by: default avatarMauro Carvalho Chehab <m.chehab@samsung.com>
parent 63746b5f

drivers/media/platform/omap3isp/ispstat.c

+0 −2
Original line number Diff line number Diff line
@@ -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);