diff for duplicates of <10745567623617@kroah.com> diff --git a/a/1.txt b/N1/1.txt index 7e4746c..a8e7e8c 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -62,7 +62,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 + * + * Since the LM90 was the first chipset supported by this driver, most + * comments will refer to this chipset, but are actually general and @@ -383,20 +383,20 @@ diff -Nru a/drivers/i2c/chips/lm90.c b/drivers/i2c/chips/lm90.c + chip_id = i2c_smbus_read_byte_data(new_client, + 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; + name = "lm90"; + } + } -+ else if (man_id = 0x41) { /* Analog Devices */ -+ if ((chip_id & 0xF0) = 0x40 /* ADM1032 */ -+ && (kind = 0 /* skip detection */ -+ || (reg_config1 & 0x3F) = 0x00)) { ++ else if (man_id == 0x41) { /* Analog Devices */ ++ if ((chip_id & 0xF0) == 0x40 /* ADM1032 */ ++ && (kind == 0 /* skip detection */ ++ || (reg_config1 & 0x3F) == 0x00)) { + kind = adm1032; + name = "adm1032"; + } diff --git a/a/content_digest b/N1/content_digest index 6eedc53..515028c 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,7 @@ "ref\010745567611005@kroah.com\0" - "ref\01074556757661@kroah.com\0" - "From\0greg@kroah.com (Greg KH)\0" - "Subject\0[PATCH] i2c driver fixes for 2.6.1\0" - "Date\0Thu, 19 May 2005 06:24:36 +0000\0" + "From\0Greg KH <greg@kroah.com>\0" + "Subject\0Re: [PATCH] i2c driver fixes for 2.6.1\0" + "Date\0Mon, 19 Jan 2004 15:59:22 -0800\0" "To\0linux-kernel@vger.kernel.org" " sensors@stimpy.netroedge.com\0" "\00:1\0" @@ -71,7 +70,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" "+ *\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" @@ -392,20 +391,20 @@ "+\t\tchip_id = i2c_smbus_read_byte_data(new_client,\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\t\tname = \"lm90\";\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\t\t && (kind = 0 /* skip detection */\n" - "+\t\t\t || (reg_config1 & 0x3F) = 0x00)) {\n" + "+\t\telse if (man_id == 0x41) { /* Analog Devices */\n" + "+\t\t\tif ((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" "+\t\t\t\tname = \"adm1032\";\n" "+\t\t\t}\n" @@ -587,4 +586,4 @@ " \n" /* -be0a8c89af20d7c6f7621343b84bf7cfdc8be9941d402cd2f8190d5dfd7bead2 +b5f8601206acfe1a1d314b2c10cb875ef768052a941546c6f964175360f2d487
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.