]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
[media] V4L2: Delete an unnecessary check before the function call "media_entity_put"
authorMarkus Elfring <elfring@users.sourceforge.net>
Tue, 3 Feb 2015 14:27:38 +0000 (11:27 -0300)
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>
Wed, 8 Apr 2015 10:38:19 +0000 (07:38 -0300)
The media_entity_put() 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>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
drivers/media/v4l2-core/v4l2-subdev.c

index 8bafb942552b5f25fda7837b8553118984d53dc0..63596063b21362fe82f51a37c0c91b5f860d926d 100644 (file)
@@ -93,8 +93,7 @@ static int subdev_open(struct file *file)
 
 err:
 #if defined(CONFIG_MEDIA_CONTROLLER)
-       if (entity)
-               media_entity_put(entity);
+       media_entity_put(entity);
 #endif
        v4l2_fh_del(&subdev_fh->vfh);
        v4l2_fh_exit(&subdev_fh->vfh);