3 files changed, 17 insertions, 10 deletions

diff --git a/sound/i2c/other/tea575x-tuner.c b/sound/i2c/other/tea575x-tuner.c
index ba2bc511d777..b29b88f93c9e 100644
--- a/sound/i2c/other/tea575x-tuner.c
+++ b/sound/i2c/other/tea575x-tuner.c
@@ -37,8 +37,8 @@ MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>");
 MODULE_DESCRIPTION("Routines for control of TEA5757/5759 Philips AM/FM radio tuner chips");
 MODULE_LICENSE("GPL");
 
-#define FREQ_LO          (76U * 16000)
-#define FREQ_HI         (108U * 16000)
+#define FREQ_LO         ((tea->tea5759 ? 760 :  875) * 1600U)
+#define FREQ_HI         ((tea->tea5759 ? 910 : 1080) * 1600U)
 
 /*
  * definitions
@@ -120,9 +120,9 @@ static u32 snd_tea575x_read(struct snd_tea575x *tea)
         return data;
 }
 
-static u32 snd_tea575x_get_freq(struct snd_tea575x *tea)
+static u32 snd_tea575x_val_to_freq(struct snd_tea575x *tea, u32 val)
 {
-        u32 freq = snd_tea575x_read(tea) & TEA575X_BIT_FREQ_MASK;
+        u32 freq = val & TEA575X_BIT_FREQ_MASK;
 
         if (freq == 0)
                 return freq;
@@ -139,6 +139,11 @@ static u32 snd_tea575x_get_freq(struct snd_tea575x *tea)
         return clamp(freq * 16, FREQ_LO, FREQ_HI); /* from kHz */
 }
 
+static u32 snd_tea575x_get_freq(struct snd_tea575x *tea)
+{
+        return snd_tea575x_val_to_freq(tea, snd_tea575x_read(tea));
+}
+
 static void snd_tea575x_set_freq(struct snd_tea575x *tea)
 {
         u32 freq = tea->freq;
@@ -156,6 +161,7 @@ static void snd_tea575x_set_freq(struct snd_tea575x *tea)
         tea->val &= ~TEA575X_BIT_FREQ_MASK;
         tea->val |= freq & TEA575X_BIT_FREQ_MASK;
         snd_tea575x_write(tea, tea->val);
+        tea->freq = snd_tea575x_val_to_freq(tea, tea->val);
 }
 
 /*
@@ -319,7 +325,6 @@ static int tea575x_s_ctrl(struct v4l2_ctrl *ctrl)
 }
 
 static const struct v4l2_file_operations tea575x_fops = {
-        .owner          = THIS_MODULE,
         .unlocked_ioctl = video_ioctl2,
         .open           = v4l2_fh_open,
         .release        = v4l2_fh_release,
@@ -339,7 +344,6 @@ static const struct v4l2_ioctl_ops tea575x_ioctl_ops = {
 };
 
 static const struct video_device tea575x_radio = {
-        .fops           = &tea575x_fops,
         .ioctl_ops      = &tea575x_ioctl_ops,
         .release        = video_device_release_empty,
 };
@@ -351,7 +355,7 @@ static const struct v4l2_ctrl_ops tea575x_ctrl_ops = {
 /*
  * initialize all the tea575x chips
  */
-int snd_tea575x_init(struct snd_tea575x *tea)
+int snd_tea575x_init(struct snd_tea575x *tea, struct module *owner)
 {
         int retval;
 
@@ -376,6 +380,9 @@ int snd_tea575x_init(struct snd_tea575x *tea)
         tea->vd.lock = &tea->mutex;
         tea->vd.v4l2_dev = tea->v4l2_dev;
         tea->vd.ctrl_handler = &tea->ctrl_handler;
+        tea->fops = tea575x_fops;
+        tea->fops.owner = owner;
+        tea->vd.fops = &tea->fops;
         set_bit(V4L2_FL_USE_FH_PRIO, &tea->vd.flags);
         /* disable hw_freq_seek if we can't use it */
         if (tea->cannot_read_data)
diff --git a/sound/pci/es1968.c b/sound/pci/es1968.c
index a8faae1c85e4..0f2811eeeebd 100644
--- a/sound/pci/es1968.c
+++ b/sound/pci/es1968.c
@@ -2769,7 +2769,7 @@ static int __devinit snd_es1968_create(struct snd_card *card,
         chip->tea.ops = &snd_es1968_tea_ops;
         strlcpy(chip->tea.card, "SF64-PCE2", sizeof(chip->tea.card));
         sprintf(chip->tea.bus_info, "PCI:%s", pci_name(pci));
-        if (!snd_tea575x_init(&chip->tea))
+        if (!snd_tea575x_init(&chip->tea, THIS_MODULE))
                 printk(KERN_INFO "es1968: detected TEA575x radio\n");
 #endif
 
diff --git a/sound/pci/fm801.c b/sound/pci/fm801.c
index a416ea8af3e9..5265c576a26a 100644
--- a/sound/pci/fm801.c
+++ b/sound/pci/fm801.c
@@ -1254,7 +1254,7 @@ static int __devinit snd_fm801_create(struct snd_card *card,
         sprintf(chip->tea.bus_info, "PCI:%s", pci_name(pci));
         if ((tea575x_tuner & TUNER_TYPE_MASK) > 0 &&
             (tea575x_tuner & TUNER_TYPE_MASK) < 4) {
-                if (snd_tea575x_init(&chip->tea)) {
+                if (snd_tea575x_init(&chip->tea, THIS_MODULE)) {
                         snd_printk(KERN_ERR "TEA575x radio not found\n");
                         snd_fm801_free(chip);
                         return -ENODEV;
@@ -1263,7 +1263,7 @@ static int __devinit snd_fm801_create(struct snd_card *card,
                 /* autodetect tuner connection */
                 for (tea575x_tuner = 1; tea575x_tuner <= 3; tea575x_tuner++) {
                         chip->tea575x_tuner = tea575x_tuner;
-                        if (!snd_tea575x_init(&chip->tea)) {
+                        if (!snd_tea575x_init(&chip->tea, THIS_MODULE)) {
                                 snd_printk(KERN_INFO "detected TEA575x radio type %s\n",
                                            get_tea575x_gpio(chip)->name);
                                 break;