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
  ...

8 files changed, 59 insertions, 82 deletions

diff --git a/drivers/media/radio/radio-cadet.c b/drivers/media/radio/radio-cadet.c
index 482d0f3be5ff..b701ea6e7c73 100644
--- a/drivers/media/radio/radio-cadet.c
+++ b/drivers/media/radio/radio-cadet.c
@@ -374,7 +374,8 @@ static int vidioc_g_tuner(struct file *file, void *priv,
         switch (v->index) {
         case 0:
                 strlcpy(v->name, "FM", sizeof(v->name));
-                v->capability = V4L2_TUNER_CAP_STEREO | V4L2_TUNER_CAP_RDS;
+                v->capability = V4L2_TUNER_CAP_STEREO | V4L2_TUNER_CAP_RDS |
+                        V4L2_TUNER_CAP_RDS_BLOCK_IO;
                 v->rangelow = 1400;     /* 87.5 MHz */
                 v->rangehigh = 1728;    /* 108.0 MHz */
                 v->rxsubchans = cadet_getstereo(dev);
diff --git a/drivers/media/radio/radio-mr800.c b/drivers/media/radio/radio-mr800.c
index 353b82855949..b540e8072e92 100644
--- a/drivers/media/radio/radio-mr800.c
+++ b/drivers/media/radio/radio-mr800.c
@@ -176,8 +176,6 @@ static int amradio_set_mute(struct amradio_device *radio, char argument)
         int retval;
         int size;
 
-        BUG_ON(!mutex_is_locked(&radio->lock));
-
         radio->buffer[0] = 0x00;
         radio->buffer[1] = 0x55;
         radio->buffer[2] = 0xaa;
@@ -207,8 +205,6 @@ static int amradio_setfreq(struct amradio_device *radio, int freq)
         int size;
         unsigned short freq_send = 0x10 + (freq >> 3) / 25;
 
-        BUG_ON(!mutex_is_locked(&radio->lock));
-
         radio->buffer[0] = 0x00;
         radio->buffer[1] = 0x55;
         radio->buffer[2] = 0xaa;
@@ -253,8 +249,6 @@ static int amradio_set_stereo(struct amradio_device *radio, char argument)
         int retval;
         int size;
 
-        BUG_ON(!mutex_is_locked(&radio->lock));
-
         radio->buffer[0] = 0x00;
         radio->buffer[1] = 0x55;
         radio->buffer[2] = 0xaa;
@@ -290,11 +284,13 @@ static void usb_amradio_disconnect(struct usb_interface *intf)
         struct amradio_device *radio = to_amradio_dev(usb_get_intfdata(intf));
 
         mutex_lock(&radio->lock);
-        radio->usbdev = NULL;
-        mutex_unlock(&radio->lock);
-
+        /* increase the device node's refcount */
+        get_device(&radio->videodev.dev);
         v4l2_device_disconnect(&radio->v4l2_dev);
         video_unregister_device(&radio->videodev);
+        mutex_unlock(&radio->lock);
+        /* decrease the device node's refcount, allowing it to be released */
+        put_device(&radio->videodev.dev);
 }
 
 /* vidioc_querycap - query device capabilities */
@@ -503,28 +499,18 @@ out:
 static int usb_amradio_open(struct file *file)
 {
         struct amradio_device *radio = video_drvdata(file);
-        int retval = 0;
-
-        mutex_lock(&radio->lock);
-
-        if (!radio->usbdev) {
-                retval = -EIO;
-                goto unlock;
-        }
+        int retval;
 
         file->private_data = radio;
         retval = usb_autopm_get_interface(radio->intf);
         if (retval)
-                goto unlock;
+                return retval;
 
         if (unlikely(!radio->initialized)) {
                 retval = usb_amradio_init(radio);
                 if (retval)
                         usb_autopm_put_interface(radio->intf);
         }
-
-unlock:
-        mutex_unlock(&radio->lock);
         return retval;
 }
 
@@ -532,37 +518,10 @@ unlock:
 static int usb_amradio_close(struct file *file)
 {
         struct amradio_device *radio = file->private_data;
-        int retval = 0;
-
-        mutex_lock(&radio->lock);
 
-        if (!radio->usbdev)
-                retval = -EIO;
-        else
+        if (video_is_registered(&radio->videodev))
                 usb_autopm_put_interface(radio->intf);
-
-        mutex_unlock(&radio->lock);
-        return retval;
-}
-
-static long usb_amradio_ioctl(struct file *file, unsigned int cmd,
-                                unsigned long arg)
-{
-        struct amradio_device *radio = file->private_data;
-        long retval = 0;
-
-        mutex_lock(&radio->lock);
-
-        if (!radio->usbdev) {
-                retval = -EIO;
-                goto unlock;
-        }
-
-        retval = video_ioctl2(file, cmd, arg);
-
-unlock:
-        mutex_unlock(&radio->lock);
-        return retval;
+        return 0;
 }
 
 /* Suspend device - stop device. Need to be checked and fixed */
@@ -571,15 +530,13 @@ static int usb_amradio_suspend(struct usb_interface *intf, pm_message_t message)
         struct amradio_device *radio = to_amradio_dev(usb_get_intfdata(intf));
 
         mutex_lock(&radio->lock);
-
         if (!radio->muted && radio->initialized) {
                 amradio_set_mute(radio, AMRADIO_STOP);
                 radio->muted = 0;
         }
+        mutex_unlock(&radio->lock);
 
         dev_info(&intf->dev, "going into suspend..\n");
-
-        mutex_unlock(&radio->lock);
         return 0;
 }
 
@@ -589,7 +546,6 @@ static int usb_amradio_resume(struct usb_interface *intf)
         struct amradio_device *radio = to_amradio_dev(usb_get_intfdata(intf));
 
         mutex_lock(&radio->lock);
-
         if (unlikely(!radio->initialized))
                 goto unlock;
 
@@ -604,9 +560,9 @@ static int usb_amradio_resume(struct usb_interface *intf)
                 amradio_set_mute(radio, AMRADIO_START);
 
 unlock:
-        dev_info(&intf->dev, "coming out of suspend..\n");
-
         mutex_unlock(&radio->lock);
+
+        dev_info(&intf->dev, "coming out of suspend..\n");
         return 0;
 }
 
@@ -615,7 +571,7 @@ static const struct v4l2_file_operations usb_amradio_fops = {
         .owner          = THIS_MODULE,
         .open           = usb_amradio_open,
         .release        = usb_amradio_close,
-        .ioctl          = usb_amradio_ioctl,
+        .unlocked_ioctl = video_ioctl2,
 };
 
 static const struct v4l2_ioctl_ops usb_amradio_ioctl_ops = {
@@ -671,19 +627,20 @@ static int usb_amradio_probe(struct usb_interface *intf,
                 goto err_v4l2;
         }
 
+        mutex_init(&radio->lock);
+
         strlcpy(radio->videodev.name, radio->v4l2_dev.name,
                 sizeof(radio->videodev.name));
         radio->videodev.v4l2_dev = &radio->v4l2_dev;
         radio->videodev.fops = &usb_amradio_fops;
         radio->videodev.ioctl_ops = &usb_amradio_ioctl_ops;
         radio->videodev.release = usb_amradio_video_device_release;
+        radio->videodev.lock = &radio->lock;
 
         radio->usbdev = interface_to_usbdev(intf);
         radio->intf = intf;
         radio->curfreq = 95.16 * FREQ_MUL;
 
-        mutex_init(&radio->lock);
-
         video_set_drvdata(&radio->videodev, radio);
 
         retval = video_register_device(&radio->videodev, VFL_TYPE_RADIO,
diff --git a/drivers/media/radio/radio-si4713.c b/drivers/media/radio/radio-si4713.c
index 13554ab13f76..6a435786b63d 100644
--- a/drivers/media/radio/radio-si4713.c
+++ b/drivers/media/radio/radio-si4713.c
@@ -291,19 +291,19 @@ static int radio_si4713_pdriver_probe(struct platform_device *pdev)
                 goto unregister_v4l2_dev;
         }
 
-        sd = v4l2_i2c_new_subdev_board(&rsdev->v4l2_dev, adapter, "si4713_i2c",
+        sd = v4l2_i2c_new_subdev_board(&rsdev->v4l2_dev, adapter, NULL,
                                         pdata->subdev_board_info, NULL);
         if (!sd) {
                 dev_err(&pdev->dev, "Cannot get v4l2 subdevice\n");
                 rval = -ENODEV;
-                goto unregister_v4l2_dev;
+                goto put_adapter;
         }
 
         rsdev->radio_dev = video_device_alloc();
         if (!rsdev->radio_dev) {
                 dev_err(&pdev->dev, "Failed to alloc video device.\n");
                 rval = -ENOMEM;
-                goto unregister_v4l2_dev;
+                goto put_adapter;
         }
 
         memcpy(rsdev->radio_dev, &radio_si4713_vdev_template,
@@ -320,6 +320,8 @@ static int radio_si4713_pdriver_probe(struct platform_device *pdev)
 
 free_vdev:
         video_device_release(rsdev->radio_dev);
+put_adapter:
+        i2c_put_adapter(adapter);
 unregister_v4l2_dev:
         v4l2_device_unregister(&rsdev->v4l2_dev);
 free_rsdev:
@@ -335,8 +337,12 @@ static int __exit radio_si4713_pdriver_remove(struct platform_device *pdev)
         struct radio_si4713_device *rsdev = container_of(v4l2_dev,
                                                 struct radio_si4713_device,
                                                 v4l2_dev);
+        struct v4l2_subdev *sd = list_entry(v4l2_dev->subdevs.next,
+                                            struct v4l2_subdev, list);
+        struct i2c_client *client = v4l2_get_subdevdata(sd);
 
         video_unregister_device(rsdev->radio_dev);
+        i2c_put_adapter(client->adapter);
         v4l2_device_unregister(&rsdev->v4l2_dev);
         kfree(rsdev);
 
diff --git a/drivers/media/radio/si470x/radio-si470x-common.c b/drivers/media/radio/si470x/radio-si470x-common.c
index 9927a595b426..ac76dfe5b3fa 100644
--- a/drivers/media/radio/si470x/radio-si470x-common.c
+++ b/drivers/media/radio/si470x/radio-si470x-common.c
@@ -408,17 +408,15 @@ done:
 /*
  * si470x_rds_on - switch on rds reception
  */
-int si470x_rds_on(struct si470x_device *radio)
+static int si470x_rds_on(struct si470x_device *radio)
 {
         int retval;
 
         /* sysconfig 1 */
-        mutex_lock(&radio->lock);
         radio->registers[SYSCONFIG1] |= SYSCONFIG1_RDS;
         retval = si470x_set_register(radio, SYSCONFIG1);
         if (retval < 0)
                 radio->registers[SYSCONFIG1] &= ~SYSCONFIG1_RDS;
-        mutex_unlock(&radio->lock);
 
         return retval;
 }
@@ -440,6 +438,7 @@ static ssize_t si470x_fops_read(struct file *file, char __user *buf,
         unsigned int block_count = 0;
 
         /* switch on rds reception */
+        mutex_lock(&radio->lock);
         if ((radio->registers[SYSCONFIG1] & SYSCONFIG1_RDS) == 0)
                 si470x_rds_on(radio);
 
@@ -480,9 +479,9 @@ static ssize_t si470x_fops_read(struct file *file, char __user *buf,
                 buf += 3;
                 retval += 3;
         }
-        mutex_unlock(&radio->lock);
 
 done:
+        mutex_unlock(&radio->lock);
         return retval;
 }
 
@@ -497,8 +496,11 @@ static unsigned int si470x_fops_poll(struct file *file,
         int retval = 0;
 
         /* switch on rds reception */
+
+        mutex_lock(&radio->lock);
         if ((radio->registers[SYSCONFIG1] & SYSCONFIG1_RDS) == 0)
                 si470x_rds_on(radio);
+        mutex_unlock(&radio->lock);
 
         poll_wait(file, &radio->read_queue, pts);
 
@@ -516,7 +518,7 @@ static const struct v4l2_file_operations si470x_fops = {
         .owner                  = THIS_MODULE,
         .read                   = si470x_fops_read,
         .poll                   = si470x_fops_poll,
-        .ioctl                  = video_ioctl2,
+        .unlocked_ioctl         = video_ioctl2,
         .open                   = si470x_fops_open,
         .release                = si470x_fops_release,
 };
@@ -572,6 +574,7 @@ static int si470x_vidioc_g_ctrl(struct file *file, void *priv,
         struct si470x_device *radio = video_drvdata(file);
         int retval = 0;
 
+        mutex_lock(&radio->lock);
         /* safety checks */
         retval = si470x_disconnect_check(radio);
         if (retval)
@@ -594,6 +597,8 @@ done:
         if (retval < 0)
                 dev_warn(&radio->videodev->dev,
                         "get control failed with %d\n", retval);
+
+        mutex_unlock(&radio->lock);
         return retval;
 }
 
@@ -607,6 +612,7 @@ static int si470x_vidioc_s_ctrl(struct file *file, void *priv,
         struct si470x_device *radio = video_drvdata(file);
         int retval = 0;
 
+        mutex_lock(&radio->lock);
         /* safety checks */
         retval = si470x_disconnect_check(radio);
         if (retval)
@@ -633,6 +639,7 @@ done:
         if (retval < 0)
                 dev_warn(&radio->videodev->dev,
                         "set control failed with %d\n", retval);
+        mutex_unlock(&radio->lock);
         return retval;
 }
 
@@ -662,6 +669,7 @@ static int si470x_vidioc_g_tuner(struct file *file, void *priv,
         struct si470x_device *radio = video_drvdata(file);
         int retval = 0;
 
+        mutex_lock(&radio->lock);
         /* safety checks */
         retval = si470x_disconnect_check(radio);
         if (retval)
@@ -681,7 +689,7 @@ static int si470x_vidioc_g_tuner(struct file *file, void *priv,
         tuner->type = V4L2_TUNER_RADIO;
 #if defined(CONFIG_USB_SI470X) || defined(CONFIG_USB_SI470X_MODULE)
         tuner->capability = V4L2_TUNER_CAP_LOW | V4L2_TUNER_CAP_STEREO |
-                            V4L2_TUNER_CAP_RDS;
+                            V4L2_TUNER_CAP_RDS | V4L2_TUNER_CAP_RDS_BLOCK_IO;
 #else
         tuner->capability = V4L2_TUNER_CAP_LOW | V4L2_TUNER_CAP_STEREO;
 #endif
@@ -737,6 +745,7 @@ done:
         if (retval < 0)
                 dev_warn(&radio->videodev->dev,
                         "get tuner failed with %d\n", retval);
+        mutex_unlock(&radio->lock);
         return retval;
 }
 
@@ -750,6 +759,7 @@ static int si470x_vidioc_s_tuner(struct file *file, void *priv,
         struct si470x_device *radio = video_drvdata(file);
         int retval = 0;
 
+        mutex_lock(&radio->lock);
         /* safety checks */
         retval = si470x_disconnect_check(radio);
         if (retval)
@@ -776,6 +786,7 @@ done:
         if (retval < 0)
                 dev_warn(&radio->videodev->dev,
                         "set tuner failed with %d\n", retval);
+        mutex_unlock(&radio->lock);
         return retval;
 }
 
@@ -790,6 +801,7 @@ static int si470x_vidioc_g_frequency(struct file *file, void *priv,
         int retval = 0;
 
         /* safety checks */
+        mutex_lock(&radio->lock);
         retval = si470x_disconnect_check(radio);
         if (retval)
                 goto done;
@@ -806,6 +818,7 @@ done:
         if (retval < 0)
                 dev_warn(&radio->videodev->dev,
                         "get frequency failed with %d\n", retval);
+        mutex_unlock(&radio->lock);
         return retval;
 }
 
@@ -819,6 +832,7 @@ static int si470x_vidioc_s_frequency(struct file *file, void *priv,
         struct si470x_device *radio = video_drvdata(file);
         int retval = 0;
 
+        mutex_lock(&radio->lock);
         /* safety checks */
         retval = si470x_disconnect_check(radio);
         if (retval)
@@ -835,6 +849,7 @@ done:
         if (retval < 0)
                 dev_warn(&radio->videodev->dev,
                         "set frequency failed with %d\n", retval);
+        mutex_unlock(&radio->lock);
         return retval;
 }
 
@@ -848,6 +863,7 @@ static int si470x_vidioc_s_hw_freq_seek(struct file *file, void *priv,
         struct si470x_device *radio = video_drvdata(file);
         int retval = 0;
 
+        mutex_lock(&radio->lock);
         /* safety checks */
         retval = si470x_disconnect_check(radio);
         if (retval)
@@ -864,6 +880,7 @@ done:
         if (retval < 0)
                 dev_warn(&radio->videodev->dev,
                         "set hardware frequency seek failed with %d\n", retval);
+        mutex_unlock(&radio->lock);
         return retval;
 }
 
diff --git a/drivers/media/radio/si470x/radio-si470x-usb.c b/drivers/media/radio/si470x/radio-si470x-usb.c
index 5ec13e50a9f0..392e84fe90ef 100644
--- a/drivers/media/radio/si470x/radio-si470x-usb.c
+++ b/drivers/media/radio/si470x/radio-si470x-usb.c
@@ -517,7 +517,7 @@ int si470x_fops_open(struct file *file)
         struct si470x_device *radio = video_drvdata(file);
         int retval;
 
-        lock_kernel();
+        mutex_lock(&radio->lock);
         radio->users++;
 
         retval = usb_autopm_get_interface(radio->intf);
@@ -558,7 +558,7 @@ int si470x_fops_open(struct file *file)
         }
 
 done:
-        unlock_kernel();
+        mutex_unlock(&radio->lock);
         return retval;
 }
 
@@ -577,7 +577,7 @@ int si470x_fops_release(struct file *file)
                 goto done;
         }
 
-        mutex_lock(&radio->disconnect_lock);
+        mutex_lock(&radio->lock);
         radio->users--;
         if (radio->users == 0) {
                 /* shutdown interrupt handler */
@@ -591,7 +591,7 @@ int si470x_fops_release(struct file *file)
                         video_unregister_device(radio->videodev);
                         kfree(radio->int_in_buffer);
                         kfree(radio->buffer);
-                        mutex_unlock(&radio->disconnect_lock);
+                        mutex_unlock(&radio->lock);
                         kfree(radio);
                         goto done;
                 }
@@ -603,7 +603,7 @@ int si470x_fops_release(struct file *file)
                 retval = si470x_stop(radio);
                 usb_autopm_put_interface(radio->intf);
         }
-        mutex_unlock(&radio->disconnect_lock);
+        mutex_unlock(&radio->lock);
 done:
         return retval;
 }
@@ -661,7 +661,6 @@ static int si470x_usb_driver_probe(struct usb_interface *intf,
         radio->disconnected = 0;
         radio->usbdev = interface_to_usbdev(intf);
         radio->intf = intf;
-        mutex_init(&radio->disconnect_lock);
         mutex_init(&radio->lock);
 
         iface_desc = intf->cur_altsetting;
@@ -830,7 +829,7 @@ static void si470x_usb_driver_disconnect(struct usb_interface *intf)
 {
         struct si470x_device *radio = usb_get_intfdata(intf);
 
-        mutex_lock(&radio->disconnect_lock);
+        mutex_lock(&radio->lock);
         radio->disconnected = 1;
         usb_set_intfdata(intf, NULL);
         if (radio->users == 0) {
@@ -843,10 +842,10 @@ static void si470x_usb_driver_disconnect(struct usb_interface *intf)
                 kfree(radio->int_in_buffer);
                 video_unregister_device(radio->videodev);
                 kfree(radio->buffer);
-                mutex_unlock(&radio->disconnect_lock);
+                mutex_unlock(&radio->lock);
                 kfree(radio);
         } else {
-                mutex_unlock(&radio->disconnect_lock);
+                mutex_unlock(&radio->lock);
         }
 }
 
diff --git a/drivers/media/radio/si470x/radio-si470x.h b/drivers/media/radio/si470x/radio-si470x.h
index 3cd0a29cd6e7..ea12782359a0 100644
--- a/drivers/media/radio/si470x/radio-si470x.h
+++ b/drivers/media/radio/si470x/radio-si470x.h
@@ -177,7 +177,6 @@ struct si470x_device {
 
         /* driver management */
         unsigned char disconnected;
-        struct mutex disconnect_lock;
 #endif
 
 #if defined(CONFIG_I2C_SI470X) || defined(CONFIG_I2C_SI470X_MODULE)
@@ -221,7 +220,6 @@ int si470x_disconnect_check(struct si470x_device *radio);
 int si470x_set_freq(struct si470x_device *radio, unsigned int freq);
 int si470x_start(struct si470x_device *radio);
 int si470x_stop(struct si470x_device *radio);
-int si470x_rds_on(struct si470x_device *radio);
 int si470x_fops_open(struct file *file);
 int si470x_fops_release(struct file *file);
 int si470x_vidioc_querycap(struct file *file, void *priv,
diff --git a/drivers/media/radio/si4713-i2c.c b/drivers/media/radio/si4713-i2c.c
index fc7f4b794649..a6e6f1987a3a 100644
--- a/drivers/media/radio/si4713-i2c.c
+++ b/drivers/media/radio/si4713-i2c.c
@@ -1804,7 +1804,7 @@ static int si4713_g_modulator(struct v4l2_subdev *sd, struct v4l2_modulator *vm)
 
         strncpy(vm->name, "FM Modulator", 32);
         vm->capability = V4L2_TUNER_CAP_STEREO | V4L2_TUNER_CAP_LOW |
-                                                V4L2_TUNER_CAP_RDS;
+                V4L2_TUNER_CAP_RDS | V4L2_TUNER_CAP_RDS_CONTROLS;
 
         /* Report current frequency range limits */
         vm->rangelow = si4713_to_v4l2(FREQ_RANGE_LOW);
diff --git a/drivers/media/radio/tef6862.c b/drivers/media/radio/tef6862.c
index 90cae90277e7..7c0d77751f6e 100644
--- a/drivers/media/radio/tef6862.c
+++ b/drivers/media/radio/tef6862.c
@@ -22,7 +22,6 @@
 #include <linux/kernel.h>
 #include <linux/interrupt.h>
 #include <linux/i2c.h>
-#include <linux/i2c-id.h>
 #include <linux/slab.h>
 #include <media/v4l2-ioctl.h>
 #include <media/v4l2-device.h>