V4L/DVB (3569): PATCH: switch cpia2 to mutexes and use ioctl 32 compat lib func

[linux-2.6] / drivers / media / video / saa7110.c

diff --git a/drivers/media/video/saa7110.c b/drivers/media/video/saa7110.c
index dff06895171bd7b830a2f24f0195c40b815e7d05..e18ea268384bda2599f3150946d12aaa8b19b453 100644 (file)
--- a/drivers/media/video/saa7110.c
+++ b/drivers/media/video/saa7110.c
@@ -107,13 +107,8 @@ saa7110_write_block (struct i2c_client *client,
         * the adapter understands raw I2C */
        if (i2c_check_functionality(client->adapter, I2C_FUNC_I2C)) {
                struct saa7110 *decoder = i2c_get_clientdata(client);
-               struct i2c_msg msg;
 
-               msg.len = len;
-               msg.buf = (char *) data;
-               msg.addr = client->addr;
-               msg.flags = 0;
-               ret = i2c_transfer(client->adapter, &msg, 1);
+               ret = i2c_master_send(client, data, len);
 
                /* Cache the written data */
                memcpy(decoder->reg + reg, data + 1, len - 1);
@@ -431,15 +426,13 @@ saa7110_command (struct i2c_client *client,
                break;
 
        case DECODER_DUMP:
-               for (v = 0; v < 0x34; v += 16) {
+               for (v = 0; v < SAA7110_NR_REG; v += 16) {
                        int j;
-                       dprintk(1, KERN_INFO "%s: %03x\n", I2C_NAME(client),
+                       dprintk(1, KERN_DEBUG "%s: %02x:", I2C_NAME(client),
                                v);
-                       for (j = 0; j < 16; j++) {
-                               dprintk(1, KERN_INFO " %02x",
-                                       decoder->reg[v + j]);
-                       }
-                       dprintk(1, KERN_INFO "\n");
+                       for (j = 0; j < 16 && v + j < SAA7110_NR_REG; j++)
+                               dprintk(1, " %02x", decoder->reg[v + j]);
+                       dprintk(1, "\n");
                }
                break;