1 files changed, 13 insertions, 4 deletions

diff --git a/drivers/media/video/em28xx/em28xx-i2c.c b/drivers/media/video/em28xx/em28xx-i2c.c
index 4739fc7e6eb..36f5a9bc8b7 100644
--- a/drivers/media/video/em28xx/em28xx-i2c.c
+++ b/drivers/media/video/em28xx/em28xx-i2c.c
@@ -181,16 +181,25 @@ static int em2800_i2c_recv_bytes(struct em28xx *dev, unsigned char addr,
 
 /*
  * em28xx_i2c_send_bytes()
- * untested for more than 4 bytes
  */
 static int em28xx_i2c_send_bytes(void *data, unsigned char addr, char *buf,
                                  short len, int stop)
 {
         int wrcount = 0;
         struct em28xx *dev = (struct em28xx *)data;
+        int write_timeout, ret;
 
         wrcount = dev->em28xx_write_regs_req(dev, stop ? 2 : 3, addr, buf, len);
 
+        /* Seems to be required after a write */
+        for (write_timeout = EM2800_I2C_WRITE_TIMEOUT; write_timeout > 0;
+             write_timeout -= 5) {
+                ret = dev->em28xx_read_reg(dev, 0x05);
+                if (!ret)
+                        break;
+                msleep(5);
+        }
+
         return wrcount;
 }
 
@@ -218,9 +227,7 @@ static int em28xx_i2c_recv_bytes(struct em28xx *dev, unsigned char addr,
  */
 static int em28xx_i2c_check_for_device(struct em28xx *dev, unsigned char addr)
 {
-        char msg;
         int ret;
-        msg = addr;
 
         ret = dev->em28xx_read_reg_req(dev, 2, addr);
         if (ret < 0) {
@@ -332,7 +339,9 @@ static int em28xx_i2c_eeprom(struct em28xx *dev, unsigned char *eedata, int len)
         struct em28xx_eeprom *em_eeprom = (void *)eedata;
         int i, err, size = len, block;
 
-        if (dev->chip_id == CHIP_ID_EM2874 || dev->chip_id == CHIP_ID_EM28174) {
+        if (dev->chip_id == CHIP_ID_EM2874 ||
+            dev->chip_id == CHIP_ID_EM28174 ||
+            dev->chip_id == CHIP_ID_EM2884) {
                 /* Empia switched to a 16-bit addressable eeprom in newer
                    devices.  While we could certainly write a routine to read
                    the eeprom, there is nothing of use in there that cannot be