summaryrefslogtreecommitdiffstats
path: root/drivers/media/video/saa7134/saa7134-video.c
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2012-01-17 13:55:28 +0100
committerPaul Mundt <lethal@linux-sh.org>2012-01-17 13:55:28 +0100
commit0c929238ca4baefe47f4034732db4c154f2329c6 (patch)
tree2636079800fa045501982a70e1be0425c1b968c2 /drivers/media/video/saa7134/saa7134-video.c
parentvideo: pvr2fb: Fix up spurious section mismatch warnings. (diff)
parentsh: fix the sh_mmcif_plat_data in board-sh7757lcr (diff)
downloadlinux-0c929238ca4baefe47f4034732db4c154f2329c6.tar.xz
linux-0c929238ca4baefe47f4034732db4c154f2329c6.zip
Merge branch 'sh/platform-updates' into sh-latest
Diffstat (limited to 'drivers/media/video/saa7134/saa7134-video.c')
-rw-r--r--drivers/media/video/saa7134/saa7134-video.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/media/video/saa7134/saa7134-video.c b/drivers/media/video/saa7134/saa7134-video.c
index 9cf7914f6f90..417034eb6ad2 100644
--- a/drivers/media/video/saa7134/saa7134-video.c
+++ b/drivers/media/video/saa7134/saa7134-video.c
@@ -1462,6 +1462,8 @@ static int video_release(struct file *file)
struct saa6588_command cmd;
unsigned long flags;
+ saa7134_tvaudio_close(dev);
+
/* turn off overlay */
if (res_check(fh, RESOURCE_OVERLAY)) {
spin_lock_irqsave(&dev->slock,flags);