summaryrefslogtreecommitdiff
path: root/drivers/media/usb/em28xx/em28xx.h
diff options
context:
space:
mode:
authorFrank Schaefer <fschaefer.oss@googlemail.com>2014-03-24 16:33:22 -0300
committerMauro Carvalho Chehab <m.chehab@samsung.com>2014-05-23 13:39:38 -0300
commit3854b0d847d558bdc820b93ae8a93c0923d0211d (patch)
tree9d7151bcc74859a8a0a7bd9e50b9533375894ea9 /drivers/media/usb/em28xx/em28xx.h
parent8139a4d583abad45eb987b5a99b3281b6d435b7e (diff)
[media] em28xx: move tuner frequency field from struct em28xx to struct v4l2
Move V4L2-specific frequency cache to struct em28xx_v4l2. Signed-off-by: Frank Schäfer <fschaefer.oss@googlemail.com> Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'drivers/media/usb/em28xx/em28xx.h')
-rw-r--r--drivers/media/usb/em28xx/em28xx.h3
1 files changed, 2 insertions, 1 deletions
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 */