diff for duplicates of <4E9EFE97.6000708@cam.ac.uk>

diff --git a/a/1.txt b/N1/1.txt
index e72b9af..f30ffb2 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -104,8 +104,7 @@ Jonathan
 >> +{
 >> +	long result;
 >> +	int val, ret, scaleint, scalepart;
->> +	struct sensor_device_attribute *sattr =
->> +		to_sensor_dev_attr(attr);
+>> +	struct sensor_device_attribute *sattr >> +		to_sensor_dev_attr(attr);
 > 
 > Does this need more than one line ?
 > 
@@ -170,7 +169,7 @@ Jonathan
 >> +	int in_i = 1, temp_i = 1, curr_i = 1;
 >> +
 >> +	st = kzalloc(sizeof(*st), GFP_KERNEL);
->> +	if (st == NULL) {
+>> +	if (st = NULL) {
 >> +		ret = -ENOMEM;
 >> +		goto error_ret;
 >> +	}
@@ -188,10 +187,10 @@ Jonathan
 >> +	st->attrs = kzalloc(sizeof(st->attrs)*(i+1), GFP_KERNEL);
 > 
 > Blanks around '*' and '+'.
-> i == 0 here, so what is the point, and what are you trying to do ?
+> i = 0 here, so what is the point, and what are you trying to do ?
 > Should it be st->num_channels instead of i + 1 ?
 > 
->> +	if (st->attrs == NULL) {
+>> +	if (st->attrs = NULL) {
 >> +		ret = -ENOMEM;
 >> +		goto error_release_channels;
 >> +	}
@@ -221,7 +220,7 @@ Jonathan
 >> +			ret = -EINVAL;
 >> +			goto error_free_attrs;
 >> +		}
->> +		if (a->dev_attr.attr.name == NULL) {
+>> +		if (a->dev_attr.attr.name = NULL) {
 >> +			ret = -ENOMEM;
 >> +			goto error_free_attrs;
 >> +		}
@@ -304,4 +303,10 @@ Jonathan
 >> -- 
 >> 1.7.7
 >>
->
+> 
+
+
+_______________________________________________
+lm-sensors mailing list
+lm-sensors@lm-sensors.org
+http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
diff --git a/a/content_digest b/N1/content_digest
index 535674d..c60b02d 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -2,8 +2,8 @@
  "ref\01319035628-32580-6-git-send-email-jic23@cam.ac.uk\0"
  "ref\020111019163816.GC2264@ericsson.com\0"
  "From\0Jonathan Cameron <jic23@cam.ac.uk>\0"
- "Subject\0Re: [PATCH 5/6] IIO:hwmon interface client driver.\0"
- "Date\0Wed, 19 Oct 2011 17:45:11 +0100\0"
+ "Subject\0Re: [lm-sensors] [PATCH 5/6] IIO:hwmon interface client driver.\0"
+ "Date\0Wed, 19 Oct 2011 16:45:11 +0000\0"
  "To\0Guenter Roeck <guenter.roeck@ericsson.com>\0"
  "Cc\0linux-kernel@vger.kernel.org <linux-kernel@vger.kernel.org>"
   linux-iio@vger.kernel.org <linux-iio@vger.kernel.org>
@@ -123,8 +123,7 @@
  ">> +{\n"
  ">> +\tlong result;\n"
  ">> +\tint val, ret, scaleint, scalepart;\n"
- ">> +\tstruct sensor_device_attribute *sattr =\n"
- ">> +\t\tto_sensor_dev_attr(attr);\n"
+ ">> +\tstruct sensor_device_attribute *sattr >> +\t\tto_sensor_dev_attr(attr);\n"
  "> \n"
  "> Does this need more than one line ?\n"
  "> \n"
@@ -189,7 +188,7 @@
  ">> +\tint in_i = 1, temp_i = 1, curr_i = 1;\n"
  ">> +\n"
  ">> +\tst = kzalloc(sizeof(*st), GFP_KERNEL);\n"
- ">> +\tif (st == NULL) {\n"
+ ">> +\tif (st = NULL) {\n"
  ">> +\t\tret = -ENOMEM;\n"
  ">> +\t\tgoto error_ret;\n"
  ">> +\t}\n"
@@ -207,10 +206,10 @@
  ">> +\tst->attrs = kzalloc(sizeof(st->attrs)*(i+1), GFP_KERNEL);\n"
  "> \n"
  "> Blanks around '*' and '+'.\n"
- "> i == 0 here, so what is the point, and what are you trying to do ?\n"
+ "> i = 0 here, so what is the point, and what are you trying to do ?\n"
  "> Should it be st->num_channels instead of i + 1 ?\n"
  "> \n"
- ">> +\tif (st->attrs == NULL) {\n"
+ ">> +\tif (st->attrs = NULL) {\n"
  ">> +\t\tret = -ENOMEM;\n"
  ">> +\t\tgoto error_release_channels;\n"
  ">> +\t}\n"
@@ -240,7 +239,7 @@
  ">> +\t\t\tret = -EINVAL;\n"
  ">> +\t\t\tgoto error_free_attrs;\n"
  ">> +\t\t}\n"
- ">> +\t\tif (a->dev_attr.attr.name == NULL) {\n"
+ ">> +\t\tif (a->dev_attr.attr.name = NULL) {\n"
  ">> +\t\t\tret = -ENOMEM;\n"
  ">> +\t\t\tgoto error_free_attrs;\n"
  ">> +\t\t}\n"
@@ -323,6 +322,12 @@
  ">> -- \n"
  ">> 1.7.7\n"
  ">>\n"
- >
+ "> \n"
+ "\n"
+ "\n"
+ "_______________________________________________\n"
+ "lm-sensors mailing list\n"
+ "lm-sensors@lm-sensors.org\n"
+ http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
 
-d366c5e0cbdef473a3a0ffc818721392d3fd98b2d92a35bab8cca7beea0efe71
+438d3f18960fa61fb14b087e7b98bfcf9d5a564b1639dd52e943d7ff334d89bb
