Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux...

[linux-beck.git] / drivers / media / media-devnode.c

diff --git a/drivers/media/media-devnode.c b/drivers/media/media-devnode.c
index 7acd19c881debe4de5e98e9658108489d4c98c10..ebf9626e5ae5a709f2cb76b3a1c173d7ddb106ba 100644 (file)
--- a/drivers/media/media-devnode.c
+++ b/drivers/media/media-devnode.c
@@ -192,7 +192,6 @@ static int media_open(struct inode *inode, struct file *filp)
 static int media_release(struct inode *inode, struct file *filp)
 {
        struct media_devnode *mdev = media_devnode_data(filp);
-       int ret = 0;
 
        if (mdev->fops->release)
                mdev->fops->release(filp);
@@ -201,7 +200,7 @@ static int media_release(struct inode *inode, struct file *filp)
           return value is ignored. */
        put_device(&mdev->dev);
        filp->private_data = NULL;
-       return ret;
+       return 0;
 }
 
 static const struct file_operations media_devnode_fops = {