summaryrefslogtreecommitdiffstats
path: root/drivers/media/v4l2-core
diff options
context:
space:
mode:
authorMarkus Elfring <elfring@users.sourceforge.net>2014-11-30 19:10:51 -0300
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2014-12-02 11:33:09 -0200
commit7c57529baa17e14c8b5406da41a3118613fe880d (patch)
tree60fff88ad7f31371bf63f83ae6e7c12feec963b7 /drivers/media/v4l2-core
parent8c17e5e3b340d7b104756c01c1eac9a907c18bf6 (diff)
downloadlinux-7c57529baa17e14c8b5406da41a3118613fe880d.tar.gz
linux-7c57529baa17e14c8b5406da41a3118613fe880d.tar.bz2
linux-7c57529baa17e14c8b5406da41a3118613fe880d.zip
[media] V4L2: Deletion of an unnecessary check before the function call "vb2_put_vma"
The vb2_put_vma() function tests whether its argument is NULL and then returns immediately. Thus the test around the call is not needed. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring <elfring@users.sourceforge.net> Acked-by: Marek Szyprowski <m.szyprowski@samsung.com> Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/media/v4l2-core')
-rw-r--r--drivers/media/v4l2-core/videobuf2-vmalloc.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/media/v4l2-core/videobuf2-vmalloc.c b/drivers/media/v4l2-core/videobuf2-vmalloc.c
index 3966b121e466..fba944e50227 100644
--- a/drivers/media/v4l2-core/videobuf2-vmalloc.c
+++ b/drivers/media/v4l2-core/videobuf2-vmalloc.c
@@ -154,8 +154,7 @@ static void vb2_vmalloc_put_userptr(void *buf_priv)
}
kfree(buf->pages);
} else {
- if (buf->vma)
- vb2_put_vma(buf->vma);
+ vb2_put_vma(buf->vma);
iounmap(buf->vaddr);
}
kfree(buf);