2 files changed, 11 insertions, 8 deletions

diff --git a/drivers/media/usb/em28xx/em28xx-video.c b/drivers/media/usb/em28xx/em28xx-video.c
index 110673a4db10..46c42c6f34f6 100644
--- a/drivers/media/usb/em28xx/em28xx-video.c
+++ b/drivers/media/usb/em28xx/em28xx-video.c
@@ -963,7 +963,7 @@ int em28xx_start_analog_streaming(struct vb2_queue *vq, unsigned int count)
 
                 /* Ask tuner to go to analog or radio mode */
                 memset(&f, 0, sizeof(f));
-                f.frequency = dev->ctl_freq;
+                f.frequency = v4l2->frequency;
                 if (vq->owner && vq->owner->vdev->vfl_type == VFL_TYPE_RADIO)
                         f.type = V4L2_TUNER_RADIO;
                 else
@@ -1593,11 +1593,12 @@ static int vidioc_g_frequency(struct file *file, void *priv,
 {
         struct em28xx_fh      *fh  = priv;
         struct em28xx         *dev = fh->dev;
+        struct em28xx_v4l2    *v4l2 = dev->v4l2;
 
         if (0 != f->tuner)
                 return -EINVAL;
 
-        f->frequency = dev->ctl_freq;
+        f->frequency = v4l2->frequency;
         return 0;
 }
 
@@ -1614,7 +1615,7 @@ static int vidioc_s_frequency(struct file *file, void *priv,
 
         v4l2_device_call_all(&v4l2->v4l2_dev, 0, tuner, s_frequency, f);
         v4l2_device_call_all(&v4l2->v4l2_dev, 0, tuner, g_frequency, &new_freq);
-        dev->ctl_freq = new_freq.frequency;
+        v4l2->frequency = new_freq.frequency;
 
         return 0;
 }
@@ -2220,9 +2221,10 @@ static struct video_device *em28xx_vdev_init(struct em28xx *dev,
 
 static void em28xx_tuner_setup(struct em28xx *dev)
 {
-        struct v4l2_device *v4l2_dev = &dev->v4l2->v4l2_dev;
-        struct tuner_setup           tun_setup;
-        struct v4l2_frequency        f;
+        struct em28xx_v4l2      *v4l2 = dev->v4l2;
+        struct v4l2_device      *v4l2_dev = &v4l2->v4l2_dev;
+        struct tuner_setup      tun_setup;
+        struct v4l2_frequency   f;
 
         if (dev->tuner_type == TUNER_ABSENT)
                 return;
@@ -2277,7 +2279,7 @@ static void em28xx_tuner_setup(struct em28xx *dev)
         f.tuner = 0;
         f.type = V4L2_TUNER_ANALOG_TV;
         f.frequency = 9076;     /* just a magic number */
-        dev->ctl_freq = f.frequency;
+        v4l2->frequency = f.frequency;
         v4l2_device_call_all(v4l2_dev, 0, tuner, s_frequency, &f);
 }
 
diff --git a/drivers/media/usb/em28xx/em28xx.h b/drivers/media/usb/em28xx/em28xx.h
index 998be42c0f70..1ea809587c93 100644
--- a/drivers/media/usb/em28xx/em28xx.h
+++ b/drivers/media/usb/em28xx/em28xx.h
@@ -527,6 +527,8 @@ struct em28xx_v4l2 {
         int users;              /* user count for exclusive use */
         int streaming_users;    /* number of actively streaming users */
 
+        u32 frequency;          /* selected tuner frequency */
+
         struct em28xx_fmt *format;
         v4l2_std_id norm;       /* selected tv norm */
 
@@ -645,7 +647,6 @@ struct em28xx {
         struct rt_mutex i2c_bus_lock;
 
         /* video for linux */
-        int ctl_freq;           /* selected frequency */
         unsigned int ctl_input; /* selected input */
         unsigned int ctl_ainput;/* selected audio input */
         unsigned int ctl_aoutput;/* selected audio output */