summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Hunold <devnull@localhost>2004-01-26 20:07:28 +0000
committerMichael Hunold <devnull@localhost>2004-01-26 20:07:28 +0000
commitdb0b800811d4e29353b8653f7133f0aec0a34ffb (patch)
treec645fe047a6bff15e3782808ff159dbb3587e0d1
parent7bbbd381417ba9860149d901f3eaeb872bff8d15 (diff)
downloadmediapointer-dvb-s2-db0b800811d4e29353b8653f7133f0aec0a34ffb.tar.gz
mediapointer-dvb-s2-db0b800811d4e29353b8653f7133f0aec0a34ffb.tar.bz2
- don't try to disable video overlay if it wasn't enabled before
(bug catched by new resource management)
-rw-r--r--linux/drivers/media/common/saa7146_video.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/linux/drivers/media/common/saa7146_video.c b/linux/drivers/media/common/saa7146_video.c
index 34fac4396..ce3093dcd 100644
--- a/linux/drivers/media/common/saa7146_video.c
+++ b/linux/drivers/media/common/saa7146_video.c
@@ -1116,6 +1116,9 @@ int saa7146_video_do_ioctl(struct inode *inode, struct file *file, unsigned int
DEB_D(("overlay is active, but in another open\n"));
return -EAGAIN;
}
+ } else {
+ DEB_D(("overlay is not active\n"));
+ return 0;
}
spin_lock_irqsave(&dev->slock,flags);
err = saa7146_stop_preview(fh);