Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq

[linux-block.git] / drivers / media / video / tvmixer.c

diff --git a/drivers/media/video/tvmixer.c b/drivers/media/video/tvmixer.c
index 7ea9132a1965f86b28b85ef7a504db74bc2b83cd..3ae5a9cd2e28f1388f526acacdd0bb00e79cd7e5 100644 (file)
--- a/drivers/media/video/tvmixer.c
+++ b/drivers/media/video/tvmixer.c
@@ -212,8 +212,7 @@ static int tvmixer_release(struct inode *inode, struct file *file)
                return -ENODEV;
        }
 
-       if (client->adapter->owner)
-               module_put(client->adapter->owner);
+       module_put(client->adapter->owner);
        return 0;
 }