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, 13 insertions, 13 deletions

diff --git a/drivers/media/video/saa7111.c b/drivers/media/video/saa7111.c
index 5e06cc98442d..f9ba0c943adf 100644
--- a/drivers/media/video/saa7111.c
+++ b/drivers/media/video/saa7111.c
@@ -69,8 +69,10 @@ MODULE_PARM_DESC(debug, "Debug level (0-1)");
 
 /* ----------------------------------------------------------------------- */
 
+#define SAA7111_NR_REG          0x18
+
 struct saa7111 {
-        unsigned char reg[32];
+        unsigned char reg[SAA7111_NR_REG];
 
         int norm;
         int input;
@@ -109,24 +111,21 @@ saa7111_write_block (struct i2c_client *client,
         if (i2c_check_functionality(client->adapter, I2C_FUNC_I2C)) {
                 /* do raw I2C, not smbus compatible */
                 struct saa7111 *decoder = 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++] =
                                     decoder->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 {
@@ -209,6 +208,7 @@ saa7111_command (struct i2c_client *client,
         switch (cmd) {
 
         case 0:
+                break;
         case DECODER_INIT:
         {
                 struct video_decoder_init *init = arg;
@@ -226,11 +226,11 @@ saa7111_command (struct i2c_client *client,
         {
                 int i;
 
-                for (i = 0; i < 32; i += 16) {
+                for (i = 0; i < SAA7111_NR_REG; i += 16) {
                         int j;
 
                         printk(KERN_DEBUG "%s: %03x", I2C_NAME(client), i);
-                        for (j = 0; j < 16; ++j) {
+                        for (j = 0; j < 16 && i + j < SAA7111_NR_REG; ++j) {
                                 printk(" %02x",
                                        saa7111_read(client, i + j));
                         }