From 845b7d2cd1d76c9b2bbb9724fc9c9bddf3a365fc Mon Sep 17 00:00:00 2001 From: Ondrej Zary Date: Fri, 1 Feb 2013 20:01:17 -0300 Subject: [PATCH] --- yaml --- r: 366998 b: refs/heads/master c: 0a5ea88b31bed56350939c6a99c4cd58904baa66 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/pci/saa7134/saa7134-video.c | 6 ++++-- trunk/drivers/media/pci/saa7134/saa7134.h | 1 - 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index af813dea28f6..a5b3f2797579 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3bbaa3a60175ed120c8ab8937c21425fd744c7b7 +refs/heads/master: 0a5ea88b31bed56350939c6a99c4cd58904baa66 diff --git a/trunk/drivers/media/pci/saa7134/saa7134-video.c b/trunk/drivers/media/pci/saa7134/saa7134-video.c index 941e2ebab41d..506a9f401db7 100644 --- a/trunk/drivers/media/pci/saa7134/saa7134-video.c +++ b/trunk/drivers/media/pci/saa7134/saa7134-video.c @@ -2051,8 +2051,11 @@ static int saa7134_g_frequency(struct file *file, void *priv, struct saa7134_fh *fh = priv; struct saa7134_dev *dev = fh->dev; + if (0 != f->tuner) + return -EINVAL; + f->type = fh->radio ? V4L2_TUNER_RADIO : V4L2_TUNER_ANALOG_TV; - f->frequency = dev->ctl_freq; + saa_call_all(dev, tuner, g_frequency, f); return 0; } @@ -2070,7 +2073,6 @@ static int saa7134_s_frequency(struct file *file, void *priv, if (1 == fh->radio && V4L2_TUNER_RADIO != f->type) return -EINVAL; mutex_lock(&dev->lock); - dev->ctl_freq = f->frequency; saa_call_all(dev, tuner, s_frequency, f); diff --git a/trunk/drivers/media/pci/saa7134/saa7134.h b/trunk/drivers/media/pci/saa7134/saa7134.h index fc07b19ed536..d2ad16c1569a 100644 --- a/trunk/drivers/media/pci/saa7134/saa7134.h +++ b/trunk/drivers/media/pci/saa7134/saa7134.h @@ -607,7 +607,6 @@ struct saa7134_dev { int ctl_contrast; int ctl_hue; int ctl_saturation; - int ctl_freq; int ctl_mute; /* audio */ int ctl_volume; int ctl_invert; /* private */