From: Markus Elfring <elfring@users.sourceforge.net>
Date: Sun, 30 Nov 2014 22:10:51 +0000 (-0300)
Subject: [media] V4L2: Deletion of an unnecessary check before the function call "vb2_put_vma"
X-Git-Tag: Ubuntu-snapdragon-4.4.0-1050.54~9130^2~40
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=7c57529baa17e14c8b5406da41a3118613fe880d;p=mirror_ubuntu-artful-kernel.git

[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>
---

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);