diff for duplicates of <10845773561979@kroah.com> diff --git a/a/1.txt b/N1/1.txt index d47fa70..d36af88 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -8,8 +8,8 @@ chip on-board for monitoring the GPU temperature. Relevant pointers: http://archives.andrew.net.au/lm-sensors/msg07671.html -http://secure.netroedge.com/~lm78/readticket.cgi?ticket\x1661 -http://secure.netroedge.com/~lm78/readticket.cgi?ticket\x1662 +http://secure.netroedge.com/~lm78/readticket.cgi?ticket=1661 +http://secure.netroedge.com/~lm78/readticket.cgi?ticket=1662 Additional effects of the patch: @@ -112,11 +112,11 @@ diff -Nru a/drivers/i2c/chips/lm90.c b/drivers/i2c/chips/lm90.c @@ -330,16 +343,26 @@ LM90_REG_R_CHIP_ID); - if (man_id = 0x01) { /* National Semiconductor */ + if (man_id == 0x01) { /* National Semiconductor */ - if (chip_id >= 0x21 && chip_id < 0x30 /* LM90 */ -- && (kind = 0 /* skip detection */ +- && (kind == 0 /* skip detection */ - || ((i2c_smbus_read_byte_data(new_client, -- LM90_REG_R_CONFIG2) & 0xF8) = 0x00 +- LM90_REG_R_CONFIG2) & 0xF8) == 0x00 - && reg_convrate <= 0x09))) { - kind = lm90; + u8 reg_config2; @@ -124,32 +124,32 @@ diff -Nru a/drivers/i2c/chips/lm90.c b/drivers/i2c/chips/lm90.c + 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 (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 (man_id = 0x41) { /* Analog Devices */ -- if ((chip_id & 0xF0) = 0x40 /* ADM1032 */ +- else if (man_id == 0x41) { /* Analog Devices */ +- if ((chip_id & 0xF0) == 0x40 /* ADM1032 */ + } else -+ if (man_id = 0x41) { /* Analog Devices */ -+ if (address = 0x4C -+ && (chip_id & 0xF0) = 0x40 /* ADM1032 */ - && (kind = 0 /* skip detection */ - || (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)) { kind = adm1032; @@ -358,6 +381,8 @@ name = "lm90"; - } else if (kind = adm1032) { + } else if (kind == adm1032) { name = "adm1032"; -+ } else if (kind = lm99) { ++ } else if (kind == lm99) { + name = "lm99"; } diff --git a/a/content_digest b/N1/content_digest index 980f74c..59226e5 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,7 @@ "ref\020040514232755.GA18395@kroah.com\0" - "ref\010845773562431@kroah.com\0" - "From\0greg@kroah.com (Greg KH)\0" + "From\0Greg KH <greg@kroah.com>\0" "Subject\0[PATCH] I2C update for 2.6.6\0" - "Date\0Thu, 19 May 2005 06:24:57 +0000\0" + "Date\0Fri, 14 May 2004 16:29:16 -0700\0" "To\0linux-kernel@vger.kernel.org" " sensors@stimpy.netroedge.com\0" "\00:1\0" @@ -17,8 +16,8 @@ "\n" "Relevant pointers:\n" "http://archives.andrew.net.au/lm-sensors/msg07671.html\n" - "http://secure.netroedge.com/~lm78/readticket.cgi?ticket\02661\n" - "http://secure.netroedge.com/~lm78/readticket.cgi?ticket\02662\n" + "http://secure.netroedge.com/~lm78/readticket.cgi?ticket=1661\n" + "http://secure.netroedge.com/~lm78/readticket.cgi?ticket=1662\n" "\n" "Additional effects of the patch:\n" "\n" @@ -121,11 +120,11 @@ "@@ -330,16 +343,26 @@\n" " \t\t\t LM90_REG_R_CHIP_ID);\n" " \t\t\n" - " \t\tif (man_id = 0x01) { /* National Semiconductor */\n" + " \t\tif (man_id == 0x01) { /* National Semiconductor */\n" "-\t\t\tif (chip_id >= 0x21 && chip_id < 0x30 /* LM90 */\n" - "-\t\t\t && (kind = 0 /* skip detection */\n" + "-\t\t\t && (kind == 0 /* skip detection */\n" "-\t\t\t || ((i2c_smbus_read_byte_data(new_client,\n" - "-\t\t\t\tLM90_REG_R_CONFIG2) & 0xF8) = 0x00\n" + "-\t\t\t\tLM90_REG_R_CONFIG2) & 0xF8) == 0x00\n" "-\t\t\t && reg_convrate <= 0x09))) {\n" "-\t\t\t\tkind = lm90;\n" "+\t\t\tu8 reg_config2;\n" @@ -133,35 +132,35 @@ "+\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\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}\n" " \t\t\t}\n" "-\t\t}\n" - "-\t\telse if (man_id = 0x41) { /* Analog Devices */\n" - "-\t\t\tif ((chip_id & 0xF0) = 0x40 /* ADM1032 */\n" + "-\t\telse if (man_id == 0x41) { /* Analog Devices */\n" + "-\t\t\tif ((chip_id & 0xF0) == 0x40 /* ADM1032 */\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\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\tkind = adm1032;\n" "@@ -358,6 +381,8 @@\n" " \t\tname = \"lm90\";\n" - " \t} else if (kind = adm1032) {\n" + " \t} else if (kind == adm1032) {\n" " \t\tname = \"adm1032\";\n" - "+\t} else if (kind = lm99) {\n" + "+\t} else if (kind == lm99) {\n" "+\t\tname = \"lm99\";\n" " \t}\n" " \n" " \t/* We can fill in the remaining client fields */" -fc164df9b7b9daa2e81c00bdcbaf87bc262c161616948d720f25207c663aee33 +9318beae90c99a7da0de9262f866fb73e772f0af9ec8458712428e2732c5128c
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.