From 5f7c3ba489d56a95785685cb2916edc1dfde8c75 Mon Sep 17 00:00:00 2001 From: Maxim Levitsky Date: Thu, 27 Sep 2007 20:34:15 -0300 Subject: [PATCH] --- yaml --- r: 65932 b: refs/heads/master c: b4aeb8b8232bd80764997bf38f574f63e118c259 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/video/saa7134/saa7134-video.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 3e613e27ed09..33a7c4e902ad 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9900132f3437e9373aa030cdb5bd2d5db15566e3 +refs/heads/master: b4aeb8b8232bd80764997bf38f574f63e118c259 diff --git a/trunk/drivers/media/video/saa7134/saa7134-video.c b/trunk/drivers/media/video/saa7134/saa7134-video.c index cf40a9690a50..27c659cd0f30 100644 --- a/trunk/drivers/media/video/saa7134/saa7134-video.c +++ b/trunk/drivers/media/video/saa7134/saa7134-video.c @@ -1834,7 +1834,11 @@ static int video_do_ioctl(struct inode *inode, struct file *file, if (res_check(fh, RESOURCE_OVERLAY)) { spin_lock_irqsave(&dev->slock,flags); stop_preview(dev,fh); + spin_unlock_irqrestore(&dev->slock, flags); + set_tvnorm(dev,&tvnorms[i]); + + spin_lock_irqsave(&dev->slock, flags); start_preview(dev,fh); spin_unlock_irqrestore(&dev->slock,flags); } else