Merge master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb

* master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb:
  V4L/DVB (3568k): zoran: Use i2c_master_send when possible
  V4L/DVB (3568j): adv7175: Drop unused encoder dump command
  V4L/DVB (3568i): adv7175: Drop unused register cache
  V4L/DVB (3568h): cpia: correct email address
  V4L/DVB (3568g): sem2mutex: zoran
  V4L/DVB (3568f): saa7110: Fix array overrun
  V4L/DVB (3568e): bt856: Spare memory
  V4L/DVB (3568d): saa7111.c fix
  V4L/DVB (3568c): zoran: Init cleanups
  V4L/DVB (3568b): saa7111: Prevent array overrun
  V4L/DVB (3568a): saa7114: Fix i2c block write

1 files changed, 7 insertions, 10 deletions

diff --git a/drivers/media/video/saa7185.c b/drivers/media/video/saa7185.c
index e1718e85f6c4..9f99ee1303e0 100644
--- a/drivers/media/video/saa7185.c
+++ b/drivers/media/video/saa7185.c
@@ -112,24 +112,21 @@ saa7185_write_block (struct i2c_client *client,
         if (i2c_check_functionality(client->adapter, I2C_FUNC_I2C)) {
                 /* do raw I2C, not smbus compatible */
                 struct saa7185 *encoder = i2c_get_clientdata(client);
-                struct i2c_msg msg;
                 u8 block_data[32];
+                int block_len;
 
-                msg.addr = client->addr;
-                msg.flags = 0;
                 while (len >= 2) {
-                        msg.buf = (char *) block_data;
-                        msg.len = 0;
-                        block_data[msg.len++] = reg = data[0];
+                        block_len = 0;
+                        block_data[block_len++] = reg = data[0];
                         do {
-                                block_data[msg.len++] =
+                                block_data[block_len++] =
                                     encoder->reg[reg++] = data[1];
                                 len -= 2;
                                 data += 2;
                         } while (len >= 2 && data[0] == reg &&
-                                 msg.len < 32);
-                        if ((ret = i2c_transfer(client->adapter,
-                                                &msg, 1)) < 0)
+                                 block_len < 32);
+                        if ((ret = i2c_master_send(client, block_data,
+                                                   block_len)) < 0)
                                 break;
                 }
         } else {