On Sun January 27 2013 20:45:09 Ondrej Zary wrote:
> Make saa7134 driver more V4L2 compliant: don't cache frequency in
> s_frequency/g_frequency but return real one instead
>
> Signed-off-by: Ondrej Zary <linux@xxxxxxxxxxxxxxxxxxxx>
Acked-by: Hans Verkuil <hans.verkuil@xxxxxxxxx>
> ---
> drivers/media/pci/saa7134/saa7134-video.c | 6 ++++--
> drivers/media/pci/saa7134/saa7134.h | 1 -
> 2 files changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/media/pci/saa7134/saa7134-video.c b/drivers/media/pci/saa7134/saa7134-video.c
> index be745c0..87b2b9e 100644
> --- a/drivers/media/pci/saa7134/saa7134-video.c
> +++ b/drivers/media/pci/saa7134/saa7134-video.c
> @@ -2048,8 +2048,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;
> }
> @@ -2067,7 +2070,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/drivers/media/pci/saa7134/saa7134.h b/drivers/media/pci/saa7134/saa7134.h
> index 2ffe069..d0ee05e 100644
> --- a/drivers/media/pci/saa7134/saa7134.h
> +++ b/drivers/media/pci/saa7134/saa7134.h
> @@ -604,7 +604,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 */
>
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
