aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorDevin Heitmueller <dheitmueller@hauppauge.com>2010-07-12 15:50:30 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-10-20 23:17:26 -0400
commitc09d6695bd45bb5ac57d7766e2096fe03effd5cc (patch)
tree0e16a94191866fa19789d63ce2534f8a3f4ea7ea /drivers/media
parent66d7c4318a5933099b3c57a8551b32f9f35eb741 (diff)
[media] cx231xx: set standard tune to last known frequency when switching inputs
If switching to a tuner input, reset the standard and tune to the last known frequency. We need to do this in particular for this bridge since the tuner gets powered down when captuing on the composite or s-video inputs. Signed-off-by: Devin Heitmueller <dheitmueller@hauppauge.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/video/cx231xx/cx231xx-video.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/media/video/cx231xx/cx231xx-video.c b/drivers/media/video/cx231xx/cx231xx-video.c
index 31097e403406..0880edd3a49b 100644
--- a/drivers/media/video/cx231xx/cx231xx-video.c
+++ b/drivers/media/video/cx231xx/cx231xx-video.c
@@ -1246,6 +1246,14 @@ static int vidioc_s_input(struct file *file, void *priv, unsigned int i)
1246 1246
1247 video_mux(dev, i); 1247 video_mux(dev, i);
1248 1248
1249 if (INPUT(i)->type == CX231XX_VMUX_TELEVISION ||
1250 INPUT(i)->type == CX231XX_VMUX_CABLE) {
1251 /* There's a tuner, so reset the standard and put it on the
1252 last known frequency (since it was probably powered down
1253 until now */
1254 call_all(dev, core, s_std, dev->norm);
1255 }
1256
1249 mutex_unlock(&dev->lock); 1257 mutex_unlock(&dev->lock);
1250 return 0; 1258 return 0;
1251} 1259}