Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6

* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (505 commits)
  [media] af9015: Fix max I2C message size when used with tda18271
  [media] IR: initialize ir_raw_event in few more drivers
  [media] Guard a divide in v4l1 compat layer
  [media] imon: fix nomouse modprobe option
  [media] imon: remove redundant change_protocol call
  [media] imon: fix my egregious brown paper bag w/rdev/idev split
  [media] cafe_ccic: Configure ov7670 correctly
  [media] ov7670: allow configuration of image size, clock speed, and I/O method
  [media] af9015: support for DigitalNow TinyTwin v3 [1f4d:9016]
  [media] af9015: map DigitalNow TinyTwin v2 remote
  [media] DigitalNow TinyTwin remote controller
  [media] af9015: RC fixes and improvements
  videodev2.h.xml: Update to reflect the latest changes at videodev2.h
  [media] v4l: document new Bayer and monochrome pixel formats
  [media] DocBook/v4l: Add missing formats used on gspca cpia1 and sn9c2028
  [media] firedtv: add parameter to fake ca_system_ids in CA_INFO
  [media] tm6000: fix a macro coding style issue
  tm6000: Remove some ugly debug code
  [media] Nova-S-Plus audio line input
  [media] [RFC,1/1] V4L2: Use new CAP bits in existing RDS capable drivers
  ...

5 files changed, 32 insertions, 22 deletions

diff --git a/drivers/media/video/hdpvr/hdpvr-control.c b/drivers/media/video/hdpvr/hdpvr-control.c
index 5a6b78b8d25d..068df4ba3f51 100644
--- a/drivers/media/video/hdpvr/hdpvr-control.c
+++ b/drivers/media/video/hdpvr/hdpvr-control.c
@@ -29,8 +29,6 @@ int hdpvr_config_call(struct hdpvr_device *dev, uint value, u8 valbuf)
         int ret;
         char request_type = 0x38, snd_request = 0x01;
 
-        msleep(10);
-
         mutex_lock(&dev->usbc_mutex);
         dev->usbc_buf[0] = valbuf;
         ret = usb_control_msg(dev->udev,
@@ -170,8 +168,7 @@ int hdpvr_set_audio(struct hdpvr_device *dev, u8 input,
                 if (ret == 2)
                         ret = 0;
         } else
-                ret = hdpvr_config_call(dev, CTRL_AUDIO_INPUT_VALUE,
-                                        dev->options.audio_input+1);
+                ret = hdpvr_config_call(dev, CTRL_AUDIO_INPUT_VALUE, input);
 error:
         return ret;
 }
diff --git a/drivers/media/video/hdpvr/hdpvr-core.c b/drivers/media/video/hdpvr/hdpvr-core.c
index 0cae5b82e1a2..b70d6afc9fec 100644
--- a/drivers/media/video/hdpvr/hdpvr-core.c
+++ b/drivers/media/video/hdpvr/hdpvr-core.c
@@ -60,6 +60,7 @@ static struct usb_device_id hdpvr_table[] = {
         { USB_DEVICE(HD_PVR_VENDOR_ID, HD_PVR_PRODUCT_ID1) },
         { USB_DEVICE(HD_PVR_VENDOR_ID, HD_PVR_PRODUCT_ID2) },
         { USB_DEVICE(HD_PVR_VENDOR_ID, HD_PVR_PRODUCT_ID3) },
+        { USB_DEVICE(HD_PVR_VENDOR_ID, HD_PVR_PRODUCT_ID4) },
         { }                                     /* Terminating entry */
 };
 MODULE_DEVICE_TABLE(usb, hdpvr_table);
@@ -152,19 +153,26 @@ static int device_authorization(struct hdpvr_device *dev)
                          ret, print_buf);
         }
 #endif
-        if (dev->usbc_buf[1] == HDPVR_FIRMWARE_VERSION) {
+
+        v4l2_info(&dev->v4l2_dev, "firmware version 0x%x dated %s\n",
+                          dev->usbc_buf[1], &dev->usbc_buf[2]);
+
+        switch (dev->usbc_buf[1]) {
+        case HDPVR_FIRMWARE_VERSION:
                 dev->flags &= ~HDPVR_FLAG_AC3_CAP;
-        } else if (dev->usbc_buf[1] == HDPVR_FIRMWARE_VERSION_AC3) {
-                dev->flags |= HDPVR_FLAG_AC3_CAP;
-        } else if (dev->usbc_buf[1] > HDPVR_FIRMWARE_VERSION_AC3) {
-                v4l2_info(&dev->v4l2_dev, "untested firmware version 0x%x, "
-                          "the driver might not work\n", dev->usbc_buf[1]);
+                break;
+        case HDPVR_FIRMWARE_VERSION_AC3:
+        case HDPVR_FIRMWARE_VERSION_0X12:
+        case HDPVR_FIRMWARE_VERSION_0X15:
                 dev->flags |= HDPVR_FLAG_AC3_CAP;
-        } else {
-                v4l2_err(&dev->v4l2_dev, "unknown firmware version 0x%x\n",
-                        dev->usbc_buf[1]);
-                ret = -EINVAL;
-                goto unlock;
+                break;
+        default:
+                v4l2_info(&dev->v4l2_dev, "untested firmware, the driver might"
+                          " not work.\n");
+                if (dev->usbc_buf[1] >= HDPVR_FIRMWARE_VERSION_AC3)
+                        dev->flags |= HDPVR_FLAG_AC3_CAP;
+                else
+                        dev->flags &= ~HDPVR_FLAG_AC3_CAP;
         }
 
         response = dev->usbc_buf+38;
@@ -319,8 +327,12 @@ static int hdpvr_probe(struct usb_interface *interface,
         if (default_video_input < HDPVR_VIDEO_INPUTS)
                 dev->options.video_input = default_video_input;
 
-        if (default_audio_input < HDPVR_AUDIO_INPUTS)
+        if (default_audio_input < HDPVR_AUDIO_INPUTS) {
                 dev->options.audio_input = default_audio_input;
+                if (default_audio_input == HDPVR_SPDIF)
+                        dev->options.audio_codec =
+                                V4L2_MPEG_AUDIO_ENCODING_AC3;
+        }
 
         dev->udev = usb_get_dev(interface_to_usbdev(interface));
 
diff --git a/drivers/media/video/hdpvr/hdpvr-i2c.c b/drivers/media/video/hdpvr/hdpvr-i2c.c
index 463b81bef6e2..409de11096d4 100644
--- a/drivers/media/video/hdpvr/hdpvr-i2c.c
+++ b/drivers/media/video/hdpvr/hdpvr-i2c.c
@@ -127,7 +127,6 @@ int hdpvr_register_i2c_adapter(struct hdpvr_device *dev)
         strlcpy(i2c_adap->name, "Hauppauge HD PVR I2C",
                 sizeof(i2c_adap->name));
         i2c_adap->algo  = &hdpvr_algo;
-        i2c_adap->class = I2C_CLASS_TV_ANALOG;
         i2c_adap->owner = THIS_MODULE;
         i2c_adap->dev.parent = &dev->udev->dev;
 
diff --git a/drivers/media/video/hdpvr/hdpvr-video.c b/drivers/media/video/hdpvr/hdpvr-video.c
index 4863a21b1f24..d38fe1043e47 100644
--- a/drivers/media/video/hdpvr/hdpvr-video.c
+++ b/drivers/media/video/hdpvr/hdpvr-video.c
@@ -26,7 +26,7 @@
 #include <media/v4l2-ioctl.h>
 #include "hdpvr.h"
 
-#define BULK_URB_TIMEOUT 1250 /* 1.25 seconds */
+#define BULK_URB_TIMEOUT   90 /* 0.09 seconds */
 
 #define print_buffer_status() { \
                 v4l2_dbg(MSG_BUFFER, hdpvr_debug, &dev->v4l2_dev,       \
@@ -157,6 +157,7 @@ int hdpvr_alloc_buffers(struct hdpvr_device *dev, uint count)
                                   mem, dev->bulk_in_size,
                                   hdpvr_read_bulk_callback, buf);
 
+                buf->urb->transfer_flags |= URB_NO_TRANSFER_DMA_MAP;
                 buf->status = BUFSTAT_AVAILABLE;
                 list_add_tail(&buf->buff_list, &dev->free_buff_list);
         }
@@ -337,8 +338,6 @@ static int hdpvr_stop_streaming(struct hdpvr_device *dev)
                                              dev->bulk_in_endpointAddr),
                              buf, dev->bulk_in_size, &actual_length,
                              BULK_URB_TIMEOUT)) {
-                /* wait */
-                msleep(5);
                 v4l2_dbg(MSG_BUFFER, hdpvr_debug, &dev->v4l2_dev,
                          "%2d: got %d bytes\n", c, actual_length);
         }
diff --git a/drivers/media/video/hdpvr/hdpvr.h b/drivers/media/video/hdpvr/hdpvr.h
index b0f046df3cd8..5efc963f9164 100644
--- a/drivers/media/video/hdpvr/hdpvr.h
+++ b/drivers/media/video/hdpvr/hdpvr.h
@@ -30,14 +30,17 @@
 #define HD_PVR_PRODUCT_ID       0x4900
 #define HD_PVR_PRODUCT_ID1      0x4901
 #define HD_PVR_PRODUCT_ID2      0x4902
+#define HD_PVR_PRODUCT_ID4      0x4903
 #define HD_PVR_PRODUCT_ID3      0x4982
 
 #define UNSET    (-1U)
 
 #define NUM_BUFFERS 64
 
-#define HDPVR_FIRMWARE_VERSION          0x8
-#define HDPVR_FIRMWARE_VERSION_AC3      0xd
+#define HDPVR_FIRMWARE_VERSION          0x08
+#define HDPVR_FIRMWARE_VERSION_AC3      0x0d
+#define HDPVR_FIRMWARE_VERSION_0X12     0x12
+#define HDPVR_FIRMWARE_VERSION_0X15     0x15
 
 /* #define HDPVR_DEBUG */