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

Pull media updates from Mauro Carvalho Chehab:
 "This is the first part of the media patches for v3.6.

  This patch series contain:
   - new DVB frontend: rtl2832
   - new video drivers: adv7393
   - some unused files got removed
   - a selection API cleanup between V4L2 and V4L2 subdev API's
   - a major redesign at v4l-ioctl2, in order to clean it up
   - several driver fixes and improvements."

* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (174 commits)
  v4l: Export v4l2-common.h in include/linux/Kbuild
  media: Revert "[media] Terratec Cinergy S2 USB HD Rev.2"
  [media] media: Use pr_info not homegrown pr_reg macro
  [media] Terratec Cinergy S2 USB HD Rev.2
  [media] v4l: Correct conflicting V4L2 subdev selection API documentation
  [media] Feature removal: V4L2 selections API target and flag definitions
  [media] v4l: Unify selection flags documentation
  [media] v4l: Unify selection flags
  [media] v4l: Common documentation for selection targets
  [media] v4l: Unify selection targets across V4L2 and V4L2 subdev interfaces
  [media] v4l: Remove "_ACTUAL" from subdev selection API target definition names
  [media] V4L: Remove "_ACTIVE" from the selection target name definitions
  [media] media: dvb-usb: print mac address via native %pM
  [media] s5p-tv: Use module_i2c_driver in sii9234_drv.c file
  [media] media: gpio-ir-recv: add allowed_protos for platform data
  [media] s5p-jpeg: Use module_platform_driver in jpeg-core.c file
  [media] saa7134: fix spelling of detach in label
  [media] cx88-blackbird: replace ioctl by unlocked_ioctl
  [media] cx88: don't use current_norm
  [media] cx88: fix a number of v4l2-compliance violations
  ...

3 files changed, 60 insertions, 4 deletions

diff --git a/drivers/staging/media/lirc/lirc_sir.c b/drivers/staging/media/lirc/lirc_sir.c
index 945d9623550b..4afc3b419738 100644
--- a/drivers/staging/media/lirc/lirc_sir.c
+++ b/drivers/staging/media/lirc/lirc_sir.c
@@ -52,6 +52,7 @@
 #include <linux/io.h>
 #include <asm/irq.h>
 #include <linux/fcntl.h>
+#include <linux/platform_device.h>
 #ifdef LIRC_ON_SA1100
 #include <asm/hardware.h>
 #ifdef CONFIG_SA1100_COLLIE
@@ -487,9 +488,11 @@ static struct lirc_driver driver = {
         .owner          = THIS_MODULE,
 };
 
+static struct platform_device *lirc_sir_dev;
 
 static int init_chrdev(void)
 {
+        driver.dev = &lirc_sir_dev->dev;
         driver.minor = lirc_register_driver(&driver);
         if (driver.minor < 0) {
                 printk(KERN_ERR LIRC_DRIVER_NAME ": init_chrdev() failed.\n");
@@ -1215,20 +1218,71 @@ static int init_lirc_sir(void)
         return 0;
 }
 
+static int __devinit lirc_sir_probe(struct platform_device *dev)
+{
+        return 0;
+}
+
+static int __devexit lirc_sir_remove(struct platform_device *dev)
+{
+        return 0;
+}
+
+static struct platform_driver lirc_sir_driver = {
+        .probe          = lirc_sir_probe,
+        .remove         = __devexit_p(lirc_sir_remove),
+        .driver         = {
+                .name   = "lirc_sir",
+                .owner  = THIS_MODULE,
+        },
+};
 
 static int __init lirc_sir_init(void)
 {
         int retval;
 
+        retval = platform_driver_register(&lirc_sir_driver);
+        if (retval) {
+                printk(KERN_ERR LIRC_DRIVER_NAME ": Platform driver register "
+                       "failed!\n");
+                return -ENODEV;
+        }
+
+        lirc_sir_dev = platform_device_alloc("lirc_dev", 0);
+        if (!lirc_sir_dev) {
+                printk(KERN_ERR LIRC_DRIVER_NAME ": Platform device alloc "
+                       "failed!\n");
+                retval = -ENOMEM;
+                goto pdev_alloc_fail;
+        }
+
+        retval = platform_device_add(lirc_sir_dev);
+        if (retval) {
+                printk(KERN_ERR LIRC_DRIVER_NAME ": Platform device add "
+                       "failed!\n");
+                retval = -ENODEV;
+                goto pdev_add_fail;
+        }
+
         retval = init_chrdev();
         if (retval < 0)
-                return retval;
+                goto fail;
+
         retval = init_lirc_sir();
         if (retval) {
                 drop_chrdev();
-                return retval;
+                goto fail;
         }
+
         return 0;
+
+fail:
+        platform_device_del(lirc_sir_dev);
+pdev_add_fail:
+        platform_device_put(lirc_sir_dev);
+pdev_alloc_fail:
+        platform_driver_unregister(&lirc_sir_driver);
+        return retval;
 }
 
 static void __exit lirc_sir_exit(void)
@@ -1236,6 +1290,8 @@ static void __exit lirc_sir_exit(void)
         drop_hardware();
         drop_chrdev();
         drop_port();
+        platform_device_unregister(lirc_sir_dev);
+        platform_driver_unregister(&lirc_sir_driver);
         printk(KERN_INFO LIRC_DRIVER_NAME ": Uninstalled.\n");
 }
 
diff --git a/drivers/staging/media/solo6x10/TODO b/drivers/staging/media/solo6x10/TODO
index 7e6c4fa130df..539f739fe9e6 100644
--- a/drivers/staging/media/solo6x10/TODO
+++ b/drivers/staging/media/solo6x10/TODO
@@ -20,5 +20,5 @@ TODO (general):
           - implement loopback of external sound jack with incoming audio?
           - implement pause/resume
 
-Plase send patches to Greg Kroah-Hartman <greg@kroah.com> and Cc Ben Collins
+Plase send patches to Mauro Carvalho Chehab <mchehab@redhat.com> and Cc Ben Collins
 <bcollins@bluecherry.net>
diff --git a/drivers/staging/media/solo6x10/i2c.c b/drivers/staging/media/solo6x10/i2c.c
index ef95a500b4da..398070a3d293 100644
--- a/drivers/staging/media/solo6x10/i2c.c
+++ b/drivers/staging/media/solo6x10/i2c.c
@@ -175,7 +175,7 @@ int solo_i2c_isr(struct solo_dev *solo_dev)
 
         solo_reg_write(solo_dev, SOLO_IRQ_STAT, SOLO_IRQ_IIC);
 
-        if (status & (SOLO_IIC_STATE_TRNS & SOLO_IIC_STATE_SIG_ERR) ||
+        if (status & (SOLO_IIC_STATE_TRNS | SOLO_IIC_STATE_SIG_ERR) ||
             solo_dev->i2c_id < 0) {
                 solo_i2c_stop(solo_dev);
                 return -ENXIO;