From 9c7be3b1736fc7ebf1b8c54de4f1fe49158494bd Mon Sep 17 00:00:00 2001 From: Magnus Damm Date: Wed, 10 Dec 2008 01:54:32 -0300 Subject: [PATCH] --- yaml --- r: 137735 b: refs/heads/master c: d4db588ccc738528601947d57fd398bb3f55cd31 h: refs/heads/master i: 137733: 0eaa377fdd3473294e4dace1e129a14d426bf598 137731: 5dfaf5ce7239ad46aa8547ca4efca6273f69a8b7 137727: 10008544683729c886e749dd518779bcefa35144 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/videobuf-dma-contig.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index ff37e4c291e8..1bc063c86eff 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 87e3495c316bf3b63512eb280fd4b2d6d3518755 +refs/heads/master: d4db588ccc738528601947d57fd398bb3f55cd31 diff --git a/trunk/drivers/media/video/videobuf-dma-contig.c b/trunk/drivers/media/video/videobuf-dma-contig.c index 31944b11e6ea..6109fb5f34e2 100644 --- a/trunk/drivers/media/video/videobuf-dma-contig.c +++ b/trunk/drivers/media/video/videobuf-dma-contig.c @@ -400,7 +400,7 @@ void videobuf_dma_contig_free(struct videobuf_queue *q, So, it should free memory only if the memory were allocated for read() operation. */ - if ((buf->memory != V4L2_MEMORY_USERPTR) || !buf->baddr) + if ((buf->memory != V4L2_MEMORY_USERPTR) || buf->baddr) return; if (!mem)