diff for duplicates of <20151027010235.GA31838@roeck-us.net>

diff --git a/a/1.txt b/N1/1.txt
index b973b1b..bc8d844 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -148,9 +148,9 @@ do_update() doesn't really describe the function anymore.
 > +		 * We do that extra read of the calibration register if there
 > +		 * is some hint of a chip reset.
 >  		 */
-> -		if (data->regs[INA2XX_CALIBRATION] = 0) {
+> -		if (data->regs[INA2XX_CALIBRATION] == 0) {
 > -			dev_warn(dev, "chip not calibrated, reinitializing\n");
-> +		if (*rv = 0) {
+> +		if (*rv == 0) {
 > +			unsigned int cal;
 > +
 > +			regmap_read(data->regmap, INA2XX_CALIBRATION, &cal);
@@ -158,7 +158,7 @@ do_update() doesn't really describe the function anymore.
 This needs an error check.
 
 > +
-> +			if (cal = 0) {
+> +			if (cal == 0) {
 > +				dev_warn(dev, "chip not calibrated, reinitializing\n");
 >  
 > -			rv = ina2xx_init(data);
@@ -300,7 +300,7 @@ means "return value".
 >  		return status;
 >  
 > @@ -370,17 +340,9 @@ static ssize_t ina226_set_interval(struct device *dev,
->  	if (val > INT_MAX || val = 0)
+>  	if (val > INT_MAX || val == 0)
 >  		return -EINVAL;
 >  
 > -	mutex_lock(&data->update_lock);
@@ -375,7 +375,7 @@ means "return value".
 > -	 * Ina226 has a variable update_interval. For ina219 we
 > -	 * use a constant value.
 > -	 */
-> -	if (data->kind = ina226)
+> -	if (data->kind == ina226)
 > -		ina226_set_update_interval(data);
 > -	else
 > -		data->update_interval = HZ / INA2XX_CONVERSION_RATE;
@@ -401,13 +401,8 @@ means "return value".
 > -	mutex_init(&data->update_lock);
 > -
 >  	data->groups[group++] = &ina2xx_group;
->  	if (data->kind = ina226)
+>  	if (data->kind == ina226)
 >  		data->groups[group++] = &ina226_group;
 > -- 
 > 1.9.1
-> 
-
-_______________________________________________
-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 2f261fb..1951da9 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,8 +1,8 @@
  "ref\0562B7D56.3010700@roeck-us.net\0"
  "ref\01445876673-32180-2-git-send-email-mtitinger@baylibre.com\0"
  "From\0Guenter Roeck <linux@roeck-us.net>\0"
- "Subject\0Re: [lm-sensors] [PATCH 1/2] hwmon: ina2xx: convert driver to using regmap\0"
- "Date\0Tue, 27 Oct 2015 01:02:35 +0000\0"
+ "Subject\0Re: [PATCH 1/2] hwmon: ina2xx: convert driver to using regmap\0"
+ "Date\0Mon, 26 Oct 2015 18:02:35 -0700\0"
  "To\0Marc Titinger <mtitinger@baylibre.com>\0"
  "Cc\0jdelvare@suse.com"
   lm-sensors@lm-sensors.org
@@ -159,9 +159,9 @@
  "> +\t\t * We do that extra read of the calibration register if there\n"
  "> +\t\t * is some hint of a chip reset.\n"
  ">  \t\t */\n"
- "> -\t\tif (data->regs[INA2XX_CALIBRATION] = 0) {\n"
+ "> -\t\tif (data->regs[INA2XX_CALIBRATION] == 0) {\n"
  "> -\t\t\tdev_warn(dev, \"chip not calibrated, reinitializing\\n\");\n"
- "> +\t\tif (*rv = 0) {\n"
+ "> +\t\tif (*rv == 0) {\n"
  "> +\t\t\tunsigned int cal;\n"
  "> +\n"
  "> +\t\t\tregmap_read(data->regmap, INA2XX_CALIBRATION, &cal);\n"
@@ -169,7 +169,7 @@
  "This needs an error check.\n"
  "\n"
  "> +\n"
- "> +\t\t\tif (cal = 0) {\n"
+ "> +\t\t\tif (cal == 0) {\n"
  "> +\t\t\t\tdev_warn(dev, \"chip not calibrated, reinitializing\\n\");\n"
  ">  \n"
  "> -\t\t\trv = ina2xx_init(data);\n"
@@ -311,7 +311,7 @@
  ">  \t\treturn status;\n"
  ">  \n"
  "> @@ -370,17 +340,9 @@ static ssize_t ina226_set_interval(struct device *dev,\n"
- ">  \tif (val > INT_MAX || val = 0)\n"
+ ">  \tif (val > INT_MAX || val == 0)\n"
  ">  \t\treturn -EINVAL;\n"
  ">  \n"
  "> -\tmutex_lock(&data->update_lock);\n"
@@ -386,7 +386,7 @@
  "> -\t * Ina226 has a variable update_interval. For ina219 we\n"
  "> -\t * use a constant value.\n"
  "> -\t */\n"
- "> -\tif (data->kind = ina226)\n"
+ "> -\tif (data->kind == ina226)\n"
  "> -\t\tina226_set_update_interval(data);\n"
  "> -\telse\n"
  "> -\t\tdata->update_interval = HZ / INA2XX_CONVERSION_RATE;\n"
@@ -412,15 +412,10 @@
  "> -\tmutex_init(&data->update_lock);\n"
  "> -\n"
  ">  \tdata->groups[group++] = &ina2xx_group;\n"
- ">  \tif (data->kind = ina226)\n"
+ ">  \tif (data->kind == ina226)\n"
  ">  \t\tdata->groups[group++] = &ina226_group;\n"
  "> -- \n"
  "> 1.9.1\n"
- "> \n"
- "\n"
- "_______________________________________________\n"
- "lm-sensors mailing list\n"
- "lm-sensors@lm-sensors.org\n"
- http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
+ >
 
-287dba17db6f55b18a7a023d957bec6a736e031e80df77bf29068f0b01ba68e1
+b7c3d42de4022557dc28d02dddfa31fbe8a82427708047301808f46057c62de7
