]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
[media] V4L2: Deletion of an unnecessary check before the function call "vb2_put_vma"
authorMarkus Elfring <elfring@users.sourceforge.net>
Sun, 30 Nov 2014 22:10:51 +0000 (19:10 -0300)
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>
Tue, 2 Dec 2014 13:33:09 +0000 (11:33 -0200)
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>
drivers/media/v4l2-core/videobuf2-vmalloc.c

index 3966b121e4662502ae05df552bf08b036f431e35..fba944e502271069c11f3b73328f7a4d8e457fe6 100644 (file)
@@ -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);