Merge branch 'devel-for-v3.10' into v4l_for_linus

* patchwork: (831 commits)
  [media] cx88: make core less verbose
  [media] em28xx: fix oops at em28xx_dvb_bus_ctrl()
  [media] s5c73m3: fix indentation of the help section in Kconfig
  [media] cx25821-alsa: get rid of a __must_check warning
  [media] cx25821-video: declare cx25821_vidioc_s_std as static
  [media] cx25821-video: remove maxw from cx25821_vidioc_try_fmt_vid_cap
  [media] r820t: Remove a warning for an unused value
  [media] dib0090: Fix a warning at dib0090_set_EFUSE
  [media] dib8000: fix a warning
  [media] dib8000: Fix sub-channel range
  [media] dib8000: store dtv_property_cache in a temp var
  [media] dib8000: warning fix: declare internal functions as static
  [media] r820t: quiet gcc warning on n_ring
  [media] r820t: memory leak in release()
  [media] r820t: precendence bug in r820t_xtal_check()
  [media] videodev2.h: Remove the unused old V4L1 buffer types
  [media] anysee: Grammar s/report the/report to/
  [media] anysee: Initialize ret = 0 in anysee_frontend_attach()
  [media] media: videobuf2: fix the length check for mmap
  [media] em28xx: save isoc endpoint number for DVB only if endpoint has alt settings with xMaxPacketSize != 0
  ...

Conflicts:
	drivers/media/pci/cx25821/cx25821-video.c
	drivers/media/platform/Kconfig

1 files changed, 16 insertions, 3 deletions

diff --git a/drivers/media/usb/hdpvr/hdpvr.h b/drivers/media/usb/hdpvr/hdpvr.h
index fea3c6926997..1478f3d57630 100644
--- a/drivers/media/usb/hdpvr/hdpvr.h
+++ b/drivers/media/usb/hdpvr/hdpvr.h
@@ -16,6 +16,7 @@
 #include <linux/videodev2.h>
 
 #include <media/v4l2-device.h>
+#include <media/v4l2-ctrls.h>
 #include <media/ir-kbd-i2c.h>
 
 #define HDPVR_MAX 8
@@ -37,6 +38,7 @@
 #define HDPVR_FIRMWARE_VERSION_AC3      0x0d
 #define HDPVR_FIRMWARE_VERSION_0X12     0x12
 #define HDPVR_FIRMWARE_VERSION_0X15     0x15
+#define HDPVR_FIRMWARE_VERSION_0X1E     0x1e
 
 /* #define HDPVR_DEBUG */
 
@@ -65,10 +67,19 @@ struct hdpvr_options {
 struct hdpvr_device {
         /* the v4l device for this device */
         struct video_device     *video_dev;
+        /* the control handler for this device */
+        struct v4l2_ctrl_handler hdl;
         /* the usb device for this device */
         struct usb_device       *udev;
         /* v4l2-device unused */
         struct v4l2_device      v4l2_dev;
+        struct { /* video mode/bitrate control cluster */
+                struct v4l2_ctrl *video_mode;
+                struct v4l2_ctrl *video_bitrate;
+                struct v4l2_ctrl *video_bitrate_peak;
+        };
+        /* v4l2 format */
+        uint width, height;
 
         /* the max packet size of the bulk endpoint */
         size_t                  bulk_in_size;
@@ -77,11 +88,11 @@ struct hdpvr_device {
 
         /* holds the current device status */
         __u8                    status;
-        /* count the number of openers */
-        uint                    open_count;
 
-        /* holds the cureent set options */
+        /* holds the current set options */
         struct hdpvr_options    options;
+        v4l2_std_id             cur_std;
+        struct v4l2_dv_timings  cur_dv_timings;
 
         uint                    flags;
 
@@ -99,6 +110,8 @@ struct hdpvr_device {
         struct workqueue_struct *workqueue;
         /**/
         struct work_struct      worker;
+        /* current stream owner */
+        struct v4l2_fh          *owner;
 
         /* I2C adapter */
         struct i2c_adapter      i2c_adapter;