diff for duplicates of <4933F6A4.3070801@cam.ac.uk>

diff --git a/a/1.txt b/N1/1.txt
index 0a33fba..8b177d9 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -1,9 +1,9 @@
  
-From: Jonathan Cameron <jic23-KWPb1pKIrIJaa/9Udqfwiw@public.gmane.org>
+From: Jonathan Cameron <jic23@cam.ac.uk>
 
 IIO: VTI SCA3000 3d accelerometer driver.
 
-Signed-off-by: Jonathan Cameron <jic23-KWPb1pKIrIJaa/9Udqfwiw@public.gmane.org>
+Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
 --
 This patch provides support for the VTI SCA3000 seriese of
 accelerometers. These are relatively unusual chips having
@@ -73,7 +73,7 @@ index 0000000..b05e4aa
 + * sca3000.c -- support VTI sca3000 series accelerometers
 + *              via SPI
 + *
-+ * Copyright (c) 2007 Jonathan Cameron <jic23-KWPb1pKIrIJaa/9Udqfwiw@public.gmane.org>
++ * Copyright (c) 2007 Jonathan Cameron <jic23@cam.ac.uk>
 + *
 + * Partly based upon tle62x0.c
 + *
@@ -348,7 +348,7 @@ index 0000000..d6dbb89
 + * under the terms of the GNU General Public License version 2 as published by
 + * the Free Software Foundation.
 + *
-+ * Copyright (c) 2007 Jonathan Cameron <jic23-KWPb1pKIrIJaa/9Udqfwiw@public.gmane.org>
++ * Copyright (c) 2007 Jonathan Cameron <jic23@cam.ac.uk>
 + *
 + * See industrialio/accels/sca3000.h for comments.
 + */
@@ -462,7 +462,7 @@ index 0000000..d6dbb89
 +		.tx_buf = st->tx,
 +	};
 +	*rx_p = kmalloc(len + 1, GFP_KERNEL);
-+	if (*rx_p == NULL) {
++	if (*rx_p = NULL) {
 +		ret = -ENOMEM;
 +		goto error_ret;
 +	}
@@ -988,9 +988,9 @@ index 0000000..d6dbb89
 +	/* clear the bits */
 +	rx[1] &= ~0x03;
 +
-+	if (val == base_freq/2) {
++	if (val = base_freq/2) {
 +		rx[1] |= SCA3000_OUT_CTRL_BUF_DIV_2;
-+	} else if (val == base_freq/4) {
++	} else if (val = base_freq/4) {
 +		rx[1] |= SCA3000_OUT_CTRL_BUF_DIV_4;
 +	} else if (val != base_freq) {
 +		ret = -EINVAL;
@@ -1520,7 +1520,7 @@ index 0000000..d6dbb89
 +					| SCA3000_MEAS_MODE_MOT_DET);
 +	/* if on and should be off */
 +	else if (!(st->mo_det_use_count)
-+		 && ((rx[1]&protect_mask) == SCA3000_MEAS_MODE_MOT_DET))
++		 && ((rx[1]&protect_mask) = SCA3000_MEAS_MODE_MOT_DET))
 +		ret = sca3000_write_reg(dev, SCA3000_REG_ADDR_MODE,
 +					(rx[1] & ~protect_mask));
 +exit_point_free_rx:
@@ -1671,7 +1671,7 @@ index 0000000..d6dbb89
 +	struct sca3000_state *st;
 +
 +	st = kzalloc(sizeof(struct sca3000_state), GFP_KERNEL);
-+	if (st == NULL) {
++	if (st = NULL) {
 +		ret = -ENOMEM;
 +		goto error_ret;
 +	}
@@ -1680,7 +1680,7 @@ index 0000000..d6dbb89
 +	st->info = &sca3000_spi_chip_info_tbl[variant];
 +
 +	st->indio_dev = kzalloc(sizeof(struct iio_dev), GFP_KERNEL);
-+	if (st->indio_dev == NULL) {
++	if (st->indio_dev = NULL) {
 +		ret = -ENOMEM;
 +		goto error_clear_st;
 +	}
@@ -1860,7 +1860,7 @@ index 0000000..d6dbb89
 +module_init(sca3000_init);
 +module_exit(sca3000_exit);
 +
-+MODULE_AUTHOR("Jonathan Cameron <jic23-KWPb1pKIrIJaa/9Udqfwiw@public.gmane.org>");
++MODULE_AUTHOR("Jonathan Cameron <jic23@cam.ac.uk>");
 +MODULE_DESCRIPTION("VTI SCA3000 Series Accelerometers SPI driver");
 +MODULE_LICENSE("GPL v2");
 diff --git a/drivers/industrialio/accelerometer/sca3000_ring.c b/drivers/industrialio/accelerometer/sca3000_ring.c
@@ -1917,7 +1917,7 @@ index 0000000..cedeaba
 +	int ret, num_available, num_read = 0;
 +	int bytes_per_sample = 1;
 +
-+	if (st->bps == 11)
++	if (st->bps = 11)
 +		bytes_per_sample = 2;
 +
 +	mutex_lock(&st->lock);
@@ -1960,7 +1960,7 @@ index 0000000..cedeaba
 +{
 +	*r = kzalloc(sizeof(struct iio_hw_ring_buffer),
 +		     GFP_KERNEL);
-+	if (*r == 0)
++	if (*r = 0)
 +		return -ENOMEM;
 +	return 0;
 +}
@@ -2093,7 +2093,7 @@ index 0000000..a07c70d
 + * under the terms of the GNU General Public License version 2 as published by
 + * the Free Software Foundation.
 + *
-+ * Copyright (c) 2007 Jonathan Cameron <jic23-KWPb1pKIrIJaa/9Udqfwiw@public.gmane.org>
++ * Copyright (c) 2007 Jonathan Cameron <jic23@cam.ac.uk>
 + *
 + */
 +
@@ -2123,8 +2123,7 @@ index 0000000..a07c70d
 +}
 +#endif /* _SCA3000_H_USER_ */
 
--------------------------------------------------------------------------
-This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
-Build the coolest Linux based applications with Moblin SDK & win great prizes
-Grand prize is a trip for two to an Open Source event anywhere in the world
-http://moblin-contest.org/redirect.php?banner_id=100&url=/
+_______________________________________________
+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 c8eed9e..20ec639 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,24 +1,23 @@
  "ref\04933F291.4020001@cam.ac.uk\0"
- "ref\04933F291.4020001-KWPb1pKIrIJaa/9Udqfwiw@public.gmane.org\0"
- "From\0Jonathan Cameron <jic23-KWPb1pKIrIJaa/9Udqfwiw@public.gmane.org>\0"
- "Subject\0[Industrial I/O] [11/13] RFC: VTI SCA3000 3d accelerometer driver.\0"
+ "From\0Jonathan Cameron <jic23@cam.ac.uk>\0"
+ "Subject\0[lm-sensors] [Industrial I/O] [11/13] RFC: VTI SCA3000 3d\0"
  "Date\0Mon, 01 Dec 2008 14:37:24 +0000\0"
- "To\0Jonathan Cameron <jic23-KWPb1pKIrIJaa/9Udqfwiw@public.gmane.org>\0"
- "Cc\0Dmitry Torokhov <dtor-JGs/UdohzUI@public.gmane.org>"
-  LKML <linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>
-  LM Sensors <lm-sensors-GZX6beZjE8VD60Wz+7aTrA@public.gmane.org>
-  David Brownell <david-b-yBeKhBN/0LDR7s880joybQ@public.gmane.org>
-  Jean Delvare <khali-PUYAD+kWke1g9hUCZPvPmw@public.gmane.org>
-  spi-devel-general-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org
- " Ben Nizette <bn-pV1zxKMKwgg3AZtZ2NlBNQ@public.gmane.org>\0"
+ "To\0Jonathan Cameron <jic23@cam.ac.uk>\0"
+ "Cc\0LKML <linux-kernel@vger.kernel.org>"
+  Dmitry Torokhov <dtor@mail.ru>
+  David Brownell <david-b@pacbell.net>
+  Jean Delvare <khali@linux-fr.org>
+  Ben Nizette <bn@niasdigital.com>
+  LM Sensors <lm-sensors@lm-sensors.org>
+ " spi-devel-general@lists.sourceforge.net\0"
  "\00:1\0"
  "b\0"
  " \n"
- "From: Jonathan Cameron <jic23-KWPb1pKIrIJaa/9Udqfwiw@public.gmane.org>\n"
+ "From: Jonathan Cameron <jic23@cam.ac.uk>\n"
  "\n"
  "IIO: VTI SCA3000 3d accelerometer driver.\n"
  "\n"
- "Signed-off-by: Jonathan Cameron <jic23-KWPb1pKIrIJaa/9Udqfwiw@public.gmane.org>\n"
+ "Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>\n"
  "--\n"
  "This patch provides support for the VTI SCA3000 seriese of\n"
  "accelerometers. These are relatively unusual chips having\n"
@@ -88,7 +87,7 @@
  "+ * sca3000.c -- support VTI sca3000 series accelerometers\n"
  "+ *              via SPI\n"
  "+ *\n"
- "+ * Copyright (c) 2007 Jonathan Cameron <jic23-KWPb1pKIrIJaa/9Udqfwiw@public.gmane.org>\n"
+ "+ * Copyright (c) 2007 Jonathan Cameron <jic23@cam.ac.uk>\n"
  "+ *\n"
  "+ * Partly based upon tle62x0.c\n"
  "+ *\n"
@@ -363,7 +362,7 @@
  "+ * under the terms of the GNU General Public License version 2 as published by\n"
  "+ * the Free Software Foundation.\n"
  "+ *\n"
- "+ * Copyright (c) 2007 Jonathan Cameron <jic23-KWPb1pKIrIJaa/9Udqfwiw@public.gmane.org>\n"
+ "+ * Copyright (c) 2007 Jonathan Cameron <jic23@cam.ac.uk>\n"
  "+ *\n"
  "+ * See industrialio/accels/sca3000.h for comments.\n"
  "+ */\n"
@@ -477,7 +476,7 @@
  "+\t\t.tx_buf = st->tx,\n"
  "+\t};\n"
  "+\t*rx_p = kmalloc(len + 1, GFP_KERNEL);\n"
- "+\tif (*rx_p == NULL) {\n"
+ "+\tif (*rx_p = NULL) {\n"
  "+\t\tret = -ENOMEM;\n"
  "+\t\tgoto error_ret;\n"
  "+\t}\n"
@@ -1003,9 +1002,9 @@
  "+\t/* clear the bits */\n"
  "+\trx[1] &= ~0x03;\n"
  "+\n"
- "+\tif (val == base_freq/2) {\n"
+ "+\tif (val = base_freq/2) {\n"
  "+\t\trx[1] |= SCA3000_OUT_CTRL_BUF_DIV_2;\n"
- "+\t} else if (val == base_freq/4) {\n"
+ "+\t} else if (val = base_freq/4) {\n"
  "+\t\trx[1] |= SCA3000_OUT_CTRL_BUF_DIV_4;\n"
  "+\t} else if (val != base_freq) {\n"
  "+\t\tret = -EINVAL;\n"
@@ -1535,7 +1534,7 @@
  "+\t\t\t\t\t| SCA3000_MEAS_MODE_MOT_DET);\n"
  "+\t/* if on and should be off */\n"
  "+\telse if (!(st->mo_det_use_count)\n"
- "+\t\t && ((rx[1]&protect_mask) == SCA3000_MEAS_MODE_MOT_DET))\n"
+ "+\t\t && ((rx[1]&protect_mask) = SCA3000_MEAS_MODE_MOT_DET))\n"
  "+\t\tret = sca3000_write_reg(dev, SCA3000_REG_ADDR_MODE,\n"
  "+\t\t\t\t\t(rx[1] & ~protect_mask));\n"
  "+exit_point_free_rx:\n"
@@ -1686,7 +1685,7 @@
  "+\tstruct sca3000_state *st;\n"
  "+\n"
  "+\tst = kzalloc(sizeof(struct sca3000_state), GFP_KERNEL);\n"
- "+\tif (st == NULL) {\n"
+ "+\tif (st = NULL) {\n"
  "+\t\tret = -ENOMEM;\n"
  "+\t\tgoto error_ret;\n"
  "+\t}\n"
@@ -1695,7 +1694,7 @@
  "+\tst->info = &sca3000_spi_chip_info_tbl[variant];\n"
  "+\n"
  "+\tst->indio_dev = kzalloc(sizeof(struct iio_dev), GFP_KERNEL);\n"
- "+\tif (st->indio_dev == NULL) {\n"
+ "+\tif (st->indio_dev = NULL) {\n"
  "+\t\tret = -ENOMEM;\n"
  "+\t\tgoto error_clear_st;\n"
  "+\t}\n"
@@ -1875,7 +1874,7 @@
  "+module_init(sca3000_init);\n"
  "+module_exit(sca3000_exit);\n"
  "+\n"
- "+MODULE_AUTHOR(\"Jonathan Cameron <jic23-KWPb1pKIrIJaa/9Udqfwiw@public.gmane.org>\");\n"
+ "+MODULE_AUTHOR(\"Jonathan Cameron <jic23@cam.ac.uk>\");\n"
  "+MODULE_DESCRIPTION(\"VTI SCA3000 Series Accelerometers SPI driver\");\n"
  "+MODULE_LICENSE(\"GPL v2\");\n"
  "diff --git a/drivers/industrialio/accelerometer/sca3000_ring.c b/drivers/industrialio/accelerometer/sca3000_ring.c\n"
@@ -1932,7 +1931,7 @@
  "+\tint ret, num_available, num_read = 0;\n"
  "+\tint bytes_per_sample = 1;\n"
  "+\n"
- "+\tif (st->bps == 11)\n"
+ "+\tif (st->bps = 11)\n"
  "+\t\tbytes_per_sample = 2;\n"
  "+\n"
  "+\tmutex_lock(&st->lock);\n"
@@ -1975,7 +1974,7 @@
  "+{\n"
  "+\t*r = kzalloc(sizeof(struct iio_hw_ring_buffer),\n"
  "+\t\t     GFP_KERNEL);\n"
- "+\tif (*r == 0)\n"
+ "+\tif (*r = 0)\n"
  "+\t\treturn -ENOMEM;\n"
  "+\treturn 0;\n"
  "+}\n"
@@ -2108,7 +2107,7 @@
  "+ * under the terms of the GNU General Public License version 2 as published by\n"
  "+ * the Free Software Foundation.\n"
  "+ *\n"
- "+ * Copyright (c) 2007 Jonathan Cameron <jic23-KWPb1pKIrIJaa/9Udqfwiw@public.gmane.org>\n"
+ "+ * Copyright (c) 2007 Jonathan Cameron <jic23@cam.ac.uk>\n"
  "+ *\n"
  "+ */\n"
  "+\n"
@@ -2138,10 +2137,9 @@
  "+}\n"
  "+#endif /* _SCA3000_H_USER_ */\n"
  "\n"
- "-------------------------------------------------------------------------\n"
- "This SF.Net email is sponsored by the Moblin Your Move Developer's challenge\n"
- "Build the coolest Linux based applications with Moblin SDK & win great prizes\n"
- "Grand prize is a trip for two to an Open Source event anywhere in the world\n"
- http://moblin-contest.org/redirect.php?banner_id=100&url=/
+ "_______________________________________________\n"
+ "lm-sensors mailing list\n"
+ "lm-sensors@lm-sensors.org\n"
+ http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
 
-f77fc80bbee21159b6e19de58b182c646eec7dc7c0d87549c94da8681afe3fcf
+20fe75f4565ee8d0e4ff10cbdd91a60051c0a405069f685e8ff947db655d0b7d
