diff for duplicates of <11051627761117@kroah.com> diff --git a/a/1.txt b/N1/1.txt index 23e71ad..eb903a2 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -100,7 +100,7 @@ diff -Nru a/Documentation/i2c/i2c-old-porting b/Documentation/i2c/i2c-old-portin - -struct i2c_client *client; -client = kmalloc(sizeof(*client), GFP_KERNEL); --if(client = NULL) +-if(client == NULL) - return -ENOMEM; -client_template.adapter = adap; -client_template.addr = addr; @@ -332,7 +332,7 @@ diff -Nru a/Documentation/i2c/i2c-old-porting b/Documentation/i2c/i2c-old-portin - /* mode changed, start automatic detection */ -- status = saa7110_read(decoder); -+ status = i2c_smbus_read_byte(client); -- if ((status & 3) = 0) { +- if ((status & 3) == 0) { -- saa7110_write(decoder,0x06,0x80); -+ i2c_smbus_write_byte_data(client,0x06,0x80); - if (status & 0x20) { @@ -375,7 +375,7 @@ diff -Nru a/Documentation/i2c/i2c-old-porting b/Documentation/i2c/i2c-old-portin - -- status = saa7110_read(decoder); -+ status = i2c_smbus_read_byte(client); -- if ((status & 0x03) = 0x01) { +- if ((status & 0x03) == 0x01) { - DEBUG(printk(KERN_INFO "%s: norm=secam\n",dev->name)); -- saa7110_write(decoder,0x0D,0x07); -+ i2c_smbus_write_byte_data(client,0x0D,0x07); @@ -401,9 +401,9 @@ diff -Nru a/Documentation/i2c/i2c-old-porting b/Documentation/i2c/i2c-old-portin - int rv; -- -- device->data = decoder = kmalloc(sizeof(struct saa7110), GFP_KERNEL); --- if (device->data = 0) +-- if (device->data == 0) -+ client=kmalloc(sizeof(*client), GFP_KERNEL); --+ if(client = NULL) +-+ if(client == NULL) - return -ENOMEM; -- -+ client_template.adapter = adap; @@ -411,7 +411,7 @@ diff -Nru a/Documentation/i2c/i2c-old-porting b/Documentation/i2c/i2c-old-portin -+ memcpy(client, &client_template, sizeof(*client)); -+ -+ decoder = kmalloc(sizeof(*decoder), GFP_KERNEL); --+ if (decoder = NULL) { +-+ if (decoder == NULL) { -+ kfree(client); -+ return -ENOMEM; -+ } @@ -593,7 +593,7 @@ diff -Nru a/Documentation/i2c/i2c-old-porting b/Documentation/i2c/i2c-old-portin - break; -@@ -383,7 +362,7 @@ - case DECODER_DUMP: -- for (v=0; v<34; v+\x16) { +- for (v=0; v<34; v+=16) { - int j; -- DEBUG(printk(KERN_INFO "%s: %03x\n",device->name,v)); -+ DEBUG(printk(KERN_INFO "%s: %03x\n",client->name,v)); @@ -602,7 +602,8 @@ diff -Nru a/Documentation/i2c/i2c-old-porting b/Documentation/i2c/i2c-old-portin - } -@@ -402,24 +381,30 @@ - -- static struct i2c_driver i2c_driver_saa7110 - { +- static struct i2c_driver i2c_driver_saa7110 = +- { -- "saa7110", /* name */ -- -- I2C_DRIVERID_VIDEODECODER, /* in i2c.h */ diff --git a/a/content_digest b/N1/content_digest index 39f45bd..269d2a0 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,7 @@ "ref\011051627751181@kroah.com\0" - "ref\011051627731563@kroah.com\0" - "From\0greg@kroah.com (Greg KH)\0" - "Subject\0[PATCH] I2C patches for 2.6.10\0" - "Date\0Thu, 19 May 2005 06:25:30 +0000\0" + "From\0Greg KH <greg@kroah.com>\0" + "Subject\0Re: [PATCH] I2C patches for 2.6.10\0" + "Date\0Fri, 7 Jan 2005 21:39:36 -0800\0" "To\0linux-kernel@vger.kernel.org" " sensors@stimpy.netroedge.com\0" "\00:1\0" @@ -109,7 +108,7 @@ "-\n" "-struct i2c_client *client;\n" "-client = kmalloc(sizeof(*client), GFP_KERNEL);\n" - "-if(client = NULL)\n" + "-if(client == NULL)\n" "-\treturn -ENOMEM;\n" "-client_template.adapter = adap;\n" "-client_template.addr = addr;\n" @@ -341,7 +340,7 @@ "- \t/* mode changed, start automatic detection */\n" "--\tstatus = saa7110_read(decoder);\n" "-+\tstatus = i2c_smbus_read_byte(client);\n" - "- \tif ((status & 3) = 0) {\n" + "- \tif ((status & 3) == 0) {\n" "--\t\tsaa7110_write(decoder,0x06,0x80);\n" "-+\t\ti2c_smbus_write_byte_data(client,0x06,0x80);\n" "- \t\tif (status & 0x20) {\n" @@ -384,7 +383,7 @@ "- \n" "--\tstatus = saa7110_read(decoder);\n" "-+\tstatus = i2c_smbus_read_byte(client);\n" - "- \tif ((status & 0x03) = 0x01) {\n" + "- \tif ((status & 0x03) == 0x01) {\n" "- \t\tDEBUG(printk(KERN_INFO \"%s: norm=secam\\n\",dev->name));\n" "--\t\tsaa7110_write(decoder,0x0D,0x07);\n" "-+\t\ti2c_smbus_write_byte_data(client,0x0D,0x07);\n" @@ -410,9 +409,9 @@ "- \tint\t\t\trv;\n" "--\n" "--\tdevice->data = decoder = kmalloc(sizeof(struct saa7110), GFP_KERNEL);\n" - "--\tif (device->data = 0)\n" + "--\tif (device->data == 0)\n" "-+\tclient=kmalloc(sizeof(*client), GFP_KERNEL);\n" - "-+\tif(client = NULL) \n" + "-+\tif(client == NULL) \n" "- \t\treturn -ENOMEM;\n" "--\n" "-+\tclient_template.adapter = adap;\n" @@ -420,7 +419,7 @@ "-+\tmemcpy(client, &client_template, sizeof(*client));\n" "-+\n" "-+\tdecoder = kmalloc(sizeof(*decoder), GFP_KERNEL);\n" - "-+\tif (decoder = NULL) {\n" + "-+\tif (decoder == NULL) {\n" "-+\t\tkfree(client);\n" "-+\t\treturn -ENOMEM;\n" "-+\t\t}\n" @@ -602,7 +601,7 @@ "- \t\tbreak;\n" "-@@ -383,7 +362,7 @@\n" "- \t case DECODER_DUMP:\n" - "- \t\tfor (v=0; v<34; v+\026) {\n" + "- \t\tfor (v=0; v<34; v+=16) {\n" "- \t\t\tint j;\n" "--\t\t\tDEBUG(printk(KERN_INFO \"%s: %03x\\n\",device->name,v));\n" "-+\t\t\tDEBUG(printk(KERN_INFO \"%s: %03x\\n\",client->name,v));\n" @@ -611,7 +610,8 @@ "- \t\t\t}\n" "-@@ -402,24 +381,30 @@\n" "- \n" - "- static struct i2c_driver i2c_driver_saa7110 - {\n" + "- static struct i2c_driver i2c_driver_saa7110 =\n" + "- {\n" "--\t\"saa7110\",\t\t\t/* name */\n" "--\n" "--\tI2C_DRIVERID_VIDEODECODER,\t/* in i2c.h */\n" @@ -653,4 +653,4 @@ "- \n" - -028a5899480ce4a165695bacfbc4e80c9f9beafdf0bc0fc1727677f553e4dae8 +4229047fe083d100fc076323ddfe5ab607230305e977fe7180bebefd047510c8
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.