diff for duplicates of <487E68A0.7070905@hhs.nl>

diff --git a/a/1.txt b/N1/1.txt
index 8e968ef..e7324a9 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -12,23 +12,23 @@ Jean Delvare wrote:
 >>> Cc: Krzysztof Helt <krzysztof.h1@wp.pl>
 >>> @@ -307,21 +304,22 @@ static int thmc50_detect(struct i2c_adap
 >>>  	}
->>>  	if (err == -ENODEV) {
+>>>  	if (err = -ENODEV) {
 >>>  		pr_debug("thmc50: Detection of THMC50/ADM1022 failed\n");
 >>> -		goto exit_free;
 >>> +		return err;
 >>>  	}
 >>> -	data->type = kind;
 >>>  
->>>  	if (kind == adm1022) {
+>>>  	if (kind = adm1022) {
 >>>  		int id = i2c_adapter_id(client->adapter);
 >>>  		int i;
 >>>  
 >>>  		type_name = "adm1022";
 >>> -		data->has_temp3 = (config >> 7) & 1;	/* config MSB */
 >>>  		for (i = 0; i + 1 < adm1022_temp3_num; i += 2)
->>>  			if (adm1022_temp3[i] == id &&
->>> -			    adm1022_temp3[i + 1] == address) {
->>> +			    adm1022_temp3[i + 1] == client->addr) {
+>>>  			if (adm1022_temp3[i] = id &&
+>>> -			    adm1022_temp3[i + 1] = address) {
+>>> +			    adm1022_temp3[i + 1] = client->addr) {
 >>>  				/* enable 2nd remote temp */
 >>> -				data->has_temp3 = 1;
 >>> +				config |= (1 << 7);
diff --git a/a/content_digest b/N1/content_digest
index b3ae2da..6010830 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -2,8 +2,8 @@
  "ref\0487E624B.4060908@hhs.nl\0"
  "ref\020080716231438.2913afc4@hyperion.delvare\0"
  "From\0Hans de Goede <j.w.r.degoede@hhs.nl>\0"
- "Subject\0Re: [PATCH] hwmon: (thmc50) Convert to a new-style i2c driver\0"
- "Date\0Wed, 16 Jul 2008 23:31:12 +0200\0"
+ "Subject\0Re: [lm-sensors] [PATCH] hwmon: (thmc50) Convert to a new-style i2c\0"
+ "Date\0Wed, 16 Jul 2008 21:31:12 +0000\0"
  "To\0Jean Delvare <khali@linux-fr.org>\0"
  "Cc\0Krzysztof Helt <krzysztof.h1@wp.pl>"
   Linux I2C <i2c@lm-sensors.org>
@@ -24,23 +24,23 @@
  ">>> Cc: Krzysztof Helt <krzysztof.h1@wp.pl>\n"
  ">>> @@ -307,21 +304,22 @@ static int thmc50_detect(struct i2c_adap\n"
  ">>>  \t}\n"
- ">>>  \tif (err == -ENODEV) {\n"
+ ">>>  \tif (err = -ENODEV) {\n"
  ">>>  \t\tpr_debug(\"thmc50: Detection of THMC50/ADM1022 failed\\n\");\n"
  ">>> -\t\tgoto exit_free;\n"
  ">>> +\t\treturn err;\n"
  ">>>  \t}\n"
  ">>> -\tdata->type = kind;\n"
  ">>>  \n"
- ">>>  \tif (kind == adm1022) {\n"
+ ">>>  \tif (kind = adm1022) {\n"
  ">>>  \t\tint id = i2c_adapter_id(client->adapter);\n"
  ">>>  \t\tint i;\n"
  ">>>  \n"
  ">>>  \t\ttype_name = \"adm1022\";\n"
  ">>> -\t\tdata->has_temp3 = (config >> 7) & 1;\t/* config MSB */\n"
  ">>>  \t\tfor (i = 0; i + 1 < adm1022_temp3_num; i += 2)\n"
- ">>>  \t\t\tif (adm1022_temp3[i] == id &&\n"
- ">>> -\t\t\t    adm1022_temp3[i + 1] == address) {\n"
- ">>> +\t\t\t    adm1022_temp3[i + 1] == client->addr) {\n"
+ ">>>  \t\t\tif (adm1022_temp3[i] = id &&\n"
+ ">>> -\t\t\t    adm1022_temp3[i + 1] = address) {\n"
+ ">>> +\t\t\t    adm1022_temp3[i + 1] = client->addr) {\n"
  ">>>  \t\t\t\t/* enable 2nd remote temp */\n"
  ">>> -\t\t\t\tdata->has_temp3 = 1;\n"
  ">>> +\t\t\t\tconfig |= (1 << 7);\n"
@@ -103,4 +103,4 @@
  "lm-sensors@lm-sensors.org\n"
  http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
 
-9049ce281fa6df1f0e5cd7569b3b3af6cd889ee8fdf44f4731204be46b38ebb2
+2d799860abf8c231de24e1adaf77469c6eeec23953f7c3950bd3a241fcc25d8d
