diff for duplicates of <11123113914006@kroah.com> diff --git a/a/1.txt b/N1/1.txt index eb931bf..13754fb 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -34,7 +34,7 @@ diff -Nru a/drivers/i2c/chips/lm90.c b/drivers/i2c/chips/lm90.c + * register values are decoded differently) it is ignored by this + * driver. Complete datasheet can be obtained from Analog's website + * at: -+ * http://products.analog.com/products/info.asp?productT7461 ++ * http://products.analog.com/products/info.asp?product=ADT7461 + * * Since the LM90 was the first chipset supported by this driver, most * comments will refer to this chipset, but are actually general and @@ -89,7 +89,7 @@ diff -Nru a/drivers/i2c/chips/lm90.c b/drivers/i2c/chips/lm90.c struct lm90_data *data = i2c_get_clientdata(client); \ long val = simple_strtol(buf, NULL, 10); \ - data->value = TEMP1_TO_REG(val); \ -+ if (data->kind = adt7461) \ ++ if (data->kind == adt7461) \ + data->value = TEMP1_TO_REG_ADT7461(val); \ + else \ + data->value = TEMP1_TO_REG(val); \ @@ -101,7 +101,7 @@ diff -Nru a/drivers/i2c/chips/lm90.c b/drivers/i2c/chips/lm90.c struct lm90_data *data = i2c_get_clientdata(client); \ long val = simple_strtol(buf, NULL, 10); \ - data->value = TEMP2_TO_REG(val); \ -+ if (data->kind = adt7461) \ ++ if (data->kind == adt7461) \ + data->value = TEMP2_TO_REG_ADT7461(val); \ + else \ + data->value = TEMP2_TO_REG(val); \ @@ -109,23 +109,23 @@ diff -Nru a/drivers/i2c/chips/lm90.c b/drivers/i2c/chips/lm90.c i2c_smbus_write_byte_data(client, regl, data->value & 0xff); \ return count; \ @@ -381,6 +410,12 @@ - && (reg_config1 & 0x3F) = 0x00 + && (reg_config1 & 0x3F) == 0x00 && reg_convrate <= 0x0A) { kind = adm1032; + } else -+ if (address = 0x4c -+ && chip_id = 0x51 /* ADT7461 */ -+ && (reg_config1 & 0x1F) = 0x00 /* check compat mode */ ++ if (address == 0x4c ++ && chip_id == 0x51 /* ADT7461 */ ++ && (reg_config1 & 0x1F) == 0x00 /* check compat mode */ + && reg_convrate <= 0x0A) { + kind = adt7461; } } else - if (man_id = 0x4D) { /* Maxim */ + if (man_id == 0x4D) { /* Maxim */ @@ -418,11 +453,14 @@ name = "lm86"; - } else if (kind = max6657) { + } else if (kind == max6657) { name = "max6657"; -+ } else if (kind = adt7461) { ++ } else if (kind == adt7461) { + name = "adt7461"; } diff --git a/a/content_digest b/N1/content_digest index a11e10b..b1b873d 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\011123113913563@kroah.com\0" - "From\0gregkh@suse.de (Greg KH)\0" + "From\0Greg KH <gregkh@suse.de>\0" "Subject\0[PATCH] i2c: add adt7461 chip support to lm90 driver\0" - "Date\0Thu, 19 May 2005 06:25:47 +0000\0" + "Date\0Thu, 31 Mar 2005 15:23:11 -0800\0" "To\0linux-kernel@vger.kernel.org" " sensors@stimpy.netroedge.com\0" "Cc\0jchapman@katalix.com\0" @@ -43,7 +43,7 @@ "+ * register values are decoded differently) it is ignored by this\n" "+ * driver. Complete datasheet can be obtained from Analog's website\n" "+ * at:\n" - "+ * http://products.analog.com/products/info.asp?product\302\255T7461\n" + "+ * http://products.analog.com/products/info.asp?product=ADT7461\n" "+ *\n" " * Since the LM90 was the first chipset supported by this driver, most\n" " * comments will refer to this chipset, but are actually general and\n" @@ -98,7 +98,7 @@ " \tstruct lm90_data *data = i2c_get_clientdata(client); \\\n" " \tlong val = simple_strtol(buf, NULL, 10); \\\n" "-\tdata->value = TEMP1_TO_REG(val); \\\n" - "+\tif (data->kind = adt7461) \\\n" + "+\tif (data->kind == adt7461) \\\n" "+\t\tdata->value = TEMP1_TO_REG_ADT7461(val); \\\n" "+\telse \\\n" "+\t\tdata->value = TEMP1_TO_REG(val); \\\n" @@ -110,7 +110,7 @@ " \tstruct lm90_data *data = i2c_get_clientdata(client); \\\n" " \tlong val = simple_strtol(buf, NULL, 10); \\\n" "-\tdata->value = TEMP2_TO_REG(val); \\\n" - "+\tif (data->kind = adt7461) \\\n" + "+\tif (data->kind == adt7461) \\\n" "+\t\tdata->value = TEMP2_TO_REG_ADT7461(val); \\\n" "+\telse \\\n" "+\t\tdata->value = TEMP2_TO_REG(val); \\\n" @@ -118,23 +118,23 @@ " \ti2c_smbus_write_byte_data(client, regl, data->value & 0xff); \\\n" " \treturn count; \\\n" "@@ -381,6 +410,12 @@\n" - " \t\t\t && (reg_config1 & 0x3F) = 0x00\n" + " \t\t\t && (reg_config1 & 0x3F) == 0x00\n" " \t\t\t && reg_convrate <= 0x0A) {\n" " \t\t\t\tkind = adm1032;\n" "+\t\t\t} else\n" - "+\t\t\tif (address = 0x4c\n" - "+\t\t\t && chip_id = 0x51 /* ADT7461 */\n" - "+\t\t\t && (reg_config1 & 0x1F) = 0x00 /* check compat mode */\n" + "+\t\t\tif (address == 0x4c\n" + "+\t\t\t && chip_id == 0x51 /* ADT7461 */\n" + "+\t\t\t && (reg_config1 & 0x1F) == 0x00 /* check compat mode */\n" "+\t\t\t && reg_convrate <= 0x0A) {\n" "+\t\t\t\tkind = adt7461;\n" " \t\t\t}\n" " \t\t} else\n" - " \t\tif (man_id = 0x4D) { /* Maxim */\n" + " \t\tif (man_id == 0x4D) { /* Maxim */\n" "@@ -418,11 +453,14 @@\n" " \t\tname = \"lm86\";\n" - " \t} else if (kind = max6657) {\n" + " \t} else if (kind == max6657) {\n" " \t\tname = \"max6657\";\n" - "+\t} else if (kind = adt7461) {\n" + "+\t} else if (kind == adt7461) {\n" "+\t\tname = \"adt7461\";\n" " \t}\n" " \n" @@ -146,4 +146,4 @@ " \n" " \t/* Tell the I2C layer a new client has arrived */" -a19d4542ebbe1d46a4c584b2b57ceb14fe9335971a7e7d11f250763abb211462 +5150faf3beae260283f221bcae6dbc7b81d2fd8a36d93fbdb2609ebc204375af
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.