[PATCH v4 1/4] media: pxa_camera: fix the buffer free path

[Robert Jarzmik]

From: Robert Jarzmik 

Fix the error path where the video buffer wasn't allocated nor
mapped. In this case, in the driver free path don't try to unmap memory
which was not mapped in the first place.

Signed-off-by: Robert Jarzmik 
---
 drivers/media/platform/soc_camera/pxa_camera.c | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/media/platform/soc_camera/pxa_camera.c 
b/drivers/media/platform/soc_camera/pxa_camera.c
index fcb942de0c7f..aa304950bb98 100644
--- a/drivers/media/platform/soc_camera/pxa_camera.c
+++ b/drivers/media/platform/soc_camera/pxa_camera.c
@@ -272,8 +272,8 @@ static void free_buffer(struct videobuf_queue *vq, struct 
pxa_buffer *buf)
 * longer in STATE_QUEUED or STATE_ACTIVE
 */
videobuf_waiton(vq, >vb, 0, 0);
-   videobuf_dma_unmap(vq->dev, dma);
-   videobuf_dma_free(dma);
+   if (buf->vb.state == VIDEOBUF_NEEDS_INIT)
+   return;
 
for (i = 0; i < ARRAY_SIZE(buf->dmas); i++) {
if (buf->dmas[i].sg_cpu)
@@ -283,6 +283,8 @@ static void free_buffer(struct videobuf_queue *vq, struct 
pxa_buffer *buf)
  buf->dmas[i].sg_dma);
buf->dmas[i].sg_cpu = NULL;
}
+   videobuf_dma_unmap(vq->dev, dma);
+   videobuf_dma_free(dma);
 
buf->vb.state = VIDEOBUF_NEEDS_INIT;
 }
-- 
2.1.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH v4 1/4] media: pxa_camera: fix the buffer free path

[Robert Jarzmik]

From: Robert Jarzmik robert.jarz...@intel.com

Fix the error path where the video buffer wasn't allocated nor
mapped. In this case, in the driver free path don't try to unmap memory
which was not mapped in the first place.

Signed-off-by: Robert Jarzmik robert.jarz...@free.fr
---
 drivers/media/platform/soc_camera/pxa_camera.c | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/media/platform/soc_camera/pxa_camera.c 
b/drivers/media/platform/soc_camera/pxa_camera.c
index fcb942de0c7f..aa304950bb98 100644
--- a/drivers/media/platform/soc_camera/pxa_camera.c
+++ b/drivers/media/platform/soc_camera/pxa_camera.c
@@ -272,8 +272,8 @@ static void free_buffer(struct videobuf_queue *vq, struct 
pxa_buffer *buf)
 * longer in STATE_QUEUED or STATE_ACTIVE
 */
videobuf_waiton(vq, buf-vb, 0, 0);
-   videobuf_dma_unmap(vq-dev, dma);
-   videobuf_dma_free(dma);
+   if (buf-vb.state == VIDEOBUF_NEEDS_INIT)
+   return;
 
for (i = 0; i  ARRAY_SIZE(buf-dmas); i++) {
if (buf-dmas[i].sg_cpu)
@@ -283,6 +283,8 @@ static void free_buffer(struct videobuf_queue *vq, struct 
pxa_buffer *buf)
  buf-dmas[i].sg_dma);
buf-dmas[i].sg_cpu = NULL;
}
+   videobuf_dma_unmap(vq-dev, dma);
+   videobuf_dma_free(dma);
 
buf-vb.state = VIDEOBUF_NEEDS_INIT;
 }
-- 
2.1.4

--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/