5 files changed, 20 insertions, 7 deletions

diff --git a/drivers/i2c/busses/i2c-davinci.c b/drivers/i2c/busses/i2c-davinci.c
index bd7aaff35240..67679882ebef 100644
--- a/drivers/i2c/busses/i2c-davinci.c
+++ b/drivers/i2c/busses/i2c-davinci.c
@@ -404,7 +404,7 @@ static irqreturn_t i2c_davinci_isr(int this_irq, void *dev_id)
                                                       DAVINCI_I2C_STR_REG,
                                                       w);
                         } else
-                                dev_err(dev->dev, "RDR IRQ while no"
+                                dev_err(dev->dev, "RDR IRQ while no "
                                         "data requested\n");
                         break;
 
@@ -423,7 +423,7 @@ static irqreturn_t i2c_davinci_isr(int this_irq, void *dev_id)
                                                       DAVINCI_I2C_IMR_REG,
                                                       w);
                         } else
-                                dev_err(dev->dev, "TDR IRQ while no data to"
+                                dev_err(dev->dev, "TDR IRQ while no data to "
                                         "send\n");
                         break;
 
diff --git a/drivers/i2c/busses/i2c-gpio.c b/drivers/i2c/busses/i2c-gpio.c
index 44e1cd21bb01..3ca19fc234fb 100644
--- a/drivers/i2c/busses/i2c-gpio.c
+++ b/drivers/i2c/busses/i2c-gpio.c
@@ -140,6 +140,7 @@ static int __init i2c_gpio_probe(struct platform_device *pdev)
         adap->owner = THIS_MODULE;
         snprintf(adap->name, sizeof(adap->name), "i2c-gpio%d", pdev->id);
         adap->algo_data = bit_data;
+        adap->class = I2C_CLASS_HWMON;
         adap->dev.parent = &pdev->dev;
 
         /*
diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
index 89a30028ddb6..cb55cf2ba1e9 100644
--- a/drivers/i2c/busses/i2c-omap.c
+++ b/drivers/i2c/busses/i2c-omap.c
@@ -203,7 +203,7 @@ static int omap_i2c_init(struct omap_i2c_dev *dev)
                 while (!(omap_i2c_read_reg(dev, OMAP_I2C_SYSS_REG) &
                          OMAP_I2C_SYSS_RDONE)) {
                         if (time_after(jiffies, timeout)) {
-                                dev_warn(dev->dev, "timeout waiting"
+                                dev_warn(dev->dev, "timeout waiting "
                                                 "for controller reset\n");
                                 return -ETIMEDOUT;
                         }
@@ -483,7 +483,7 @@ omap_i2c_isr(int this_irq, void *dev_id)
                                         dev->buf_len--;
                                 }
                         } else
-                                dev_err(dev->dev, "RRDY IRQ while no data"
+                                dev_err(dev->dev, "RRDY IRQ while no data "
                                                 "requested\n");
                         omap_i2c_ack_stat(dev, OMAP_I2C_STAT_RRDY);
                         continue;
@@ -498,7 +498,7 @@ omap_i2c_isr(int this_irq, void *dev_id)
                                         dev->buf_len--;
                                 }
                         } else
-                                dev_err(dev->dev, "XRDY IRQ while no"
+                                dev_err(dev->dev, "XRDY IRQ while no "
                                         "data to send\n");
                         omap_i2c_write_reg(dev, OMAP_I2C_DATA_REG, w);
                         omap_i2c_ack_stat(dev, OMAP_I2C_STAT_XRDY);
diff --git a/drivers/i2c/chips/isp1301_omap.c b/drivers/i2c/chips/isp1301_omap.c
index fe04e46991aa..b767603a07ba 100644
--- a/drivers/i2c/chips/isp1301_omap.c
+++ b/drivers/i2c/chips/isp1301_omap.c
@@ -26,7 +26,7 @@
 #include <linux/interrupt.h>
 #include <linux/platform_device.h>
 #include <linux/usb/ch9.h>
-#include <linux/usb_gadget.h>
+#include <linux/usb/gadget.h>
 #include <linux/usb.h>
 #include <linux/usb/otg.h>
 #include <linux/i2c.h>
diff --git a/drivers/media/video/videobuf-core.c b/drivers/media/video/videobuf-core.c
index de2f56b19163..81f77d2b4bd3 100644
--- a/drivers/media/video/videobuf-core.c
+++ b/drivers/media/video/videobuf-core.c
@@ -806,7 +806,7 @@ ssize_t videobuf_read_one(struct videobuf_queue *q,
 }
 
 /* Locking: Caller holds q->lock */
-int videobuf_read_start(struct videobuf_queue *q)
+int __videobuf_read_start(struct videobuf_queue *q)
 {
         enum v4l2_field field;
         unsigned long flags=0;
@@ -862,6 +862,17 @@ static void __videobuf_read_stop(struct videobuf_queue *q)
         
 }
 
+int videobuf_read_start(struct videobuf_queue *q)
+{
+        int rc;
+
+        mutex_lock(&q->lock);
+        rc = __videobuf_read_start(q);
+        mutex_unlock(&q->lock);
+
+        return rc;
+}
+
 void videobuf_read_stop(struct videobuf_queue *q)
 {
         mutex_lock(&q->lock);
@@ -1058,6 +1069,7 @@ EXPORT_SYMBOL_GPL(videobuf_dqbuf);
 EXPORT_SYMBOL_GPL(videobuf_streamon);
 EXPORT_SYMBOL_GPL(videobuf_streamoff);
 
+EXPORT_SYMBOL_GPL(videobuf_read_start);
 EXPORT_SYMBOL_GPL(videobuf_read_stop);
 EXPORT_SYMBOL_GPL(videobuf_stop);
 EXPORT_SYMBOL_GPL(videobuf_read_stream);