diff for duplicates of <10898500272030@kroah.com> diff --git a/a/1.txt b/N1/1.txt index 760a8c5..2c824ab 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -49,7 +49,7 @@ diff -Nru a/drivers/i2c/chips/lm90.c b/drivers/i2c/chips/lm90.c * Devices. That chip is similar to the LM90, with a few differences * that are not handled by this driver. Complete datasheet can be * obtained from Analog's website at: - * http://products.analog.com/products/info.asp?productM1032 + * http://products.analog.com/products/info.asp?product=ADM1032 + * Among others, it has a higher accuracy than the LM90, much like the + * LM86 does. + * @@ -107,7 +107,7 @@ diff -Nru a/drivers/i2c/chips/lm90.c b/drivers/i2c/chips/lm90.c - } - } + /* Default to an LM90 if forced */ -+ if (kind = 0) ++ if (kind == 0) + kind = lm90; - if (kind <= 0) { /* identification */ @@ -124,44 +124,44 @@ diff -Nru a/drivers/i2c/chips/lm90.c b/drivers/i2c/chips/lm90.c + reg_convrate = i2c_smbus_read_byte_data(new_client, + LM90_REG_R_CONVRATE); - if (man_id = 0x01) { /* National Semiconductor */ + if (man_id == 0x01) { /* National Semiconductor */ u8 reg_config2; @@ -348,25 +356,36 @@ reg_config2 = i2c_smbus_read_byte_data(new_client, LM90_REG_R_CONFIG2); -- if (kind = 0 /* skip detection */ -- || ((reg_config2 & 0xF8) = 0x00 +- if (kind == 0 /* skip detection */ +- || ((reg_config2 & 0xF8) == 0x00 - && reg_convrate <= 0x09)) { -+ if ((reg_config1 & 0x2A) = 0x00 -+ && (reg_config2 & 0xF8) = 0x00 ++ if ((reg_config1 & 0x2A) == 0x00 ++ && (reg_config2 & 0xF8) == 0x00 + && reg_convrate <= 0x09) { - if (address = 0x4C - && (chip_id & 0xF0) = 0x20) { /* LM90 */ + if (address == 0x4C + && (chip_id & 0xF0) == 0x20) { /* LM90 */ kind = lm90; } else - if ((chip_id & 0xF0) = 0x30) { /* LM89/LM99 */ + if ((chip_id & 0xF0) == 0x30) { /* LM89/LM99 */ kind = lm99; + } else -+ if (address = 0x4C -+ && (chip_id & 0xF0) = 0x10) { /* LM86 */ ++ if (address == 0x4C ++ && (chip_id & 0xF0) == 0x10) { /* LM86 */ + kind = lm86; } } } else - if (man_id = 0x41) { /* Analog Devices */ - if (address = 0x4C - && (chip_id & 0xF0) = 0x40 /* ADM1032 */ -- && (kind = 0 /* skip detection */ -- || (reg_config1 & 0x3F) = 0x00)) { -+ && (reg_config1 & 0x3F) = 0x00 + if (man_id == 0x41) { /* Analog Devices */ + if (address == 0x4C + && (chip_id & 0xF0) == 0x40 /* ADM1032 */ +- && (kind == 0 /* skip detection */ +- || (reg_config1 & 0x3F) == 0x00)) { ++ && (reg_config1 & 0x3F) == 0x00 + && reg_convrate <= 0x0A) { kind = adm1032; } + } else -+ if (man_id = 0x4D) { /* Maxim */ -+ if (address = 0x4C -+ && (reg_config1 & 0x1F) = 0 ++ if (man_id == 0x4D) { /* Maxim */ ++ if (address == 0x4C ++ && (reg_config1 & 0x1F) == 0 + && reg_convrate <= 0x09) { + kind = max6657; + } @@ -170,11 +170,11 @@ diff -Nru a/drivers/i2c/chips/lm90.c b/drivers/i2c/chips/lm90.c if (kind <= 0) { /* identification failed */ @@ -383,6 +402,10 @@ name = "adm1032"; - } else if (kind = lm99) { + } else if (kind == lm99) { name = "lm99"; -+ } else if (kind = lm86) { ++ } else if (kind == lm86) { + name = "lm86"; -+ } else if (kind = max6657) { ++ } else if (kind == max6657) { + name = "max6657"; } diff --git a/a/content_digest b/N1/content_digest index e24b97f..805e9fb 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,7 @@ "ref\01089850026355@kroah.com\0" - "ref\010898500251206@kroah.com\0" - "From\0greg@kroah.com (Greg KH)\0" - "Subject\0[PATCH] I2C update for 2.6.8-rc1\0" - "Date\0Thu, 19 May 2005 06:25:06 +0000\0" + "From\0Greg KH <greg@kroah.com>\0" + "Subject\0Re: [PATCH] I2C update for 2.6.8-rc1\0" + "Date\0Wed, 14 Jul 2004 17:07:07 -0700\0" "To\0linux-kernel@vger.kernel.org" " sensors@stimpy.netroedge.com\0" "\00:1\0" @@ -58,7 +57,7 @@ " * Devices. That chip is similar to the LM90, with a few differences\n" " * that are not handled by this driver. Complete datasheet can be\n" " * obtained from Analog's website at:\n" - " * http://products.analog.com/products/info.asp?product\302\255M1032\n" + " * http://products.analog.com/products/info.asp?product=ADM1032\n" "+ * Among others, it has a higher accuracy than the LM90, much like the\n" "+ * LM86 does.\n" "+ *\n" @@ -116,7 +115,7 @@ "-\t\t}\n" "-\t}\n" "+\t/* Default to an LM90 if forced */\n" - "+\tif (kind = 0)\n" + "+\tif (kind == 0)\n" "+\t\tkind = lm90;\n" " \n" "-\tif (kind <= 0) { /* identification */\n" @@ -133,44 +132,44 @@ "+\t\treg_convrate = i2c_smbus_read_byte_data(new_client,\n" "+\t\t\t LM90_REG_R_CONVRATE);\n" " \t\t\n" - " \t\tif (man_id = 0x01) { /* National Semiconductor */\n" + " \t\tif (man_id == 0x01) { /* National Semiconductor */\n" " \t\t\tu8 reg_config2;\n" "@@ -348,25 +356,36 @@\n" " \t\t\treg_config2 = i2c_smbus_read_byte_data(new_client,\n" " \t\t\t\t LM90_REG_R_CONFIG2);\n" " \n" - "-\t\t\tif (kind = 0 /* skip detection */\n" - "-\t\t\t || ((reg_config2 & 0xF8) = 0x00\n" + "-\t\t\tif (kind == 0 /* skip detection */\n" + "-\t\t\t || ((reg_config2 & 0xF8) == 0x00\n" "-\t\t\t && reg_convrate <= 0x09)) {\n" - "+\t\t\tif ((reg_config1 & 0x2A) = 0x00\n" - "+\t\t\t && (reg_config2 & 0xF8) = 0x00\n" + "+\t\t\tif ((reg_config1 & 0x2A) == 0x00\n" + "+\t\t\t && (reg_config2 & 0xF8) == 0x00\n" "+\t\t\t && reg_convrate <= 0x09) {\n" - " \t\t\t\tif (address = 0x4C\n" - " \t\t\t\t && (chip_id & 0xF0) = 0x20) { /* LM90 */\n" + " \t\t\t\tif (address == 0x4C\n" + " \t\t\t\t && (chip_id & 0xF0) == 0x20) { /* LM90 */\n" " \t\t\t\t\tkind = lm90;\n" " \t\t\t\t} else\n" - " \t\t\t\tif ((chip_id & 0xF0) = 0x30) { /* LM89/LM99 */\n" + " \t\t\t\tif ((chip_id & 0xF0) == 0x30) { /* LM89/LM99 */\n" " \t\t\t\t\tkind = lm99;\n" "+\t\t\t\t} else\n" - "+\t\t\t\tif (address = 0x4C\n" - "+\t\t\t\t && (chip_id & 0xF0) = 0x10) { /* LM86 */\n" + "+\t\t\t\tif (address == 0x4C\n" + "+\t\t\t\t && (chip_id & 0xF0) == 0x10) { /* LM86 */\n" "+\t\t\t\t\tkind = lm86;\n" " \t\t\t\t}\n" " \t\t\t}\n" " \t\t} else\n" - " \t\tif (man_id = 0x41) { /* Analog Devices */\n" - " \t\t\tif (address = 0x4C\n" - " \t\t\t && (chip_id & 0xF0) = 0x40 /* ADM1032 */\n" - "-\t\t\t && (kind = 0 /* skip detection */\n" - "-\t\t\t || (reg_config1 & 0x3F) = 0x00)) {\n" - "+\t\t\t && (reg_config1 & 0x3F) = 0x00\n" + " \t\tif (man_id == 0x41) { /* Analog Devices */\n" + " \t\t\tif (address == 0x4C\n" + " \t\t\t && (chip_id & 0xF0) == 0x40 /* ADM1032 */\n" + "-\t\t\t && (kind == 0 /* skip detection */\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}\n" "+\t\t} else\n" - "+\t\tif (man_id = 0x4D) { /* Maxim */\n" - "+\t\t\tif (address = 0x4C\n" - "+\t\t\t && (reg_config1 & 0x1F) = 0\n" + "+\t\tif (man_id == 0x4D) { /* Maxim */\n" + "+\t\t\tif (address == 0x4C\n" + "+\t\t\t && (reg_config1 & 0x1F) == 0\n" "+\t\t\t && reg_convrate <= 0x09) {\n" "+\t\t\t \tkind = max6657;\n" "+\t\t\t}\n" @@ -179,14 +178,14 @@ " \t\tif (kind <= 0) { /* identification failed */\n" "@@ -383,6 +402,10 @@\n" " \t\tname = \"adm1032\";\n" - " \t} else if (kind = lm99) {\n" + " \t} else if (kind == lm99) {\n" " \t\tname = \"lm99\";\n" - "+\t} else if (kind = lm86) {\n" + "+\t} else if (kind == lm86) {\n" "+\t\tname = \"lm86\";\n" - "+\t} else if (kind = max6657) {\n" + "+\t} else if (kind == max6657) {\n" "+\t\tname = \"max6657\";\n" " \t}\n" " \n" " \t/* We can fill in the remaining client fields */" -671065f131e82a4b2845c1bfb3b300e02d22604d1ab6b89b37ddc27dba790266 +cb09d7fa9c4561d67c01d443ed151e2f1c2faffd0e731b13cd677aea381244c5
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.