aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/usb/em28xx/em28xx.h
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/usb/em28xx/em28xx.h')
-rw-r--r--drivers/media/usb/em28xx/em28xx.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/media/usb/em28xx/em28xx.h b/drivers/media/usb/em28xx/em28xx.h
index 7edba65f99c9..998be42c0f70 100644
--- a/drivers/media/usb/em28xx/em28xx.h
+++ b/drivers/media/usb/em28xx/em28xx.h
@@ -524,6 +524,9 @@ struct em28xx_v4l2 {
524 int sensor_yres; 524 int sensor_yres;
525 int sensor_xtal; 525 int sensor_xtal;
526 526
527 int users; /* user count for exclusive use */
528 int streaming_users; /* number of actively streaming users */
529
527 struct em28xx_fmt *format; 530 struct em28xx_fmt *format;
528 v4l2_std_id norm; /* selected tv norm */ 531 v4l2_std_id norm; /* selected tv norm */
529 532
@@ -642,8 +645,6 @@ struct em28xx {
642 struct rt_mutex i2c_bus_lock; 645 struct rt_mutex i2c_bus_lock;
643 646
644 /* video for linux */ 647 /* video for linux */
645 int users; /* user count for exclusive use */
646 int streaming_users; /* Number of actively streaming users */
647 int ctl_freq; /* selected frequency */ 648 int ctl_freq; /* selected frequency */
648 unsigned int ctl_input; /* selected input */ 649 unsigned int ctl_input; /* selected input */
649 unsigned int ctl_ainput;/* selected audio input */ 650 unsigned int ctl_ainput;/* selected audio input */