diff for duplicates of <10819814503946@kroah.com> diff --git a/a/1.txt b/N1/1.txt index 0f15372..20617fa 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -18,7 +18,7 @@ http://archives.andrew.net.au/lm-sensors/msg07181.html And this ticket: -http://www2.lm-sensors.nu/~lm78/readticket.cgi?ticket\x1434 +http://www2.lm-sensors.nu/~lm78/readticket.cgi?ticket=1434 So I thought it would be good to prevent this kind of problems if possible, and read the 8 datasheets again in search for ways to refine @@ -79,19 +79,19 @@ diff -Nru a/drivers/i2c/chips/adm1021.c b/drivers/i2c/chips/adm1021.c /* Determine the chip type. */ @@ -265,11 +269,14 @@ - else if ((i = 0x4d) && - (adm1021_read_value(new_client, ADM1021_REG_DEV_ID) = 0x01)) + else if ((i == 0x4d) && + (adm1021_read_value(new_client, ADM1021_REG_DEV_ID) == 0x01)) kind = max1617a; - /* LM84 Mfr ID in a different place */ -- else if (adm1021_read_value(new_client, ADM1021_REG_CONV_RATE_R) = 0x00) +- else if (adm1021_read_value(new_client, ADM1021_REG_CONV_RATE_R) == 0x00) - kind = lm84; - else if (i = 0x54) + else if (i == 0x54) kind = mc1066; + /* LM84 Mfr ID in a different place, and it has more unused bits */ -+ else if (adm1021_read_value(new_client, ADM1021_REG_CONV_RATE_R) = 0x00 -+ && (kind = 0 /* skip extra detection */ -+ || ((adm1021_read_value(new_client, ADM1021_REG_CONFIG_R) & 0x7F) = 0x00 -+ && (adm1021_read_value(new_client, ADM1021_REG_STATUS) & 0xAB) = 0x00))) ++ else if (adm1021_read_value(new_client, ADM1021_REG_CONV_RATE_R) == 0x00 ++ && (kind == 0 /* skip extra detection */ ++ || ((adm1021_read_value(new_client, ADM1021_REG_CONFIG_R) & 0x7F) == 0x00 ++ && (adm1021_read_value(new_client, ADM1021_REG_STATUS) & 0xAB) == 0x00))) + kind = lm84; else kind = max1617; diff --git a/a/content_digest b/N1/content_digest index 3631bc2..2730ecd 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,7 @@ "ref\010819814504116@kroah.com\0" - "ref\010819814492866@kroah.com\0" - "From\0greg@kroah.com (Greg KH)\0" - "Subject\0[PATCH] I2C update for 2.6.5\0" - "Date\0Thu, 19 May 2005 06:24:52 +0000\0" + "From\0Greg KH <greg@kroah.com>\0" + "Subject\0Re: [PATCH] I2C update for 2.6.5\0" + "Date\0Wed, 14 Apr 2004 15:24:10 -0700\0" "To\0linux-kernel@vger.kernel.org" " sensors@stimpy.netroedge.com\0" "\00:1\0" @@ -27,7 +26,7 @@ "\n" "And this ticket:\n" "\n" - "http://www2.lm-sensors.nu/~lm78/readticket.cgi?ticket\02434\n" + "http://www2.lm-sensors.nu/~lm78/readticket.cgi?ticket=1434\n" "\n" "So I thought it would be good to prevent this kind of problems if\n" "possible, and read the 8 datasheets again in search for ways to refine\n" @@ -88,19 +87,19 @@ " \n" " \t/* Determine the chip type. */\n" "@@ -265,11 +269,14 @@\n" - " \t\telse if ((i = 0x4d) &&\n" - " \t\t\t (adm1021_read_value(new_client, ADM1021_REG_DEV_ID) = 0x01))\n" + " \t\telse if ((i == 0x4d) &&\n" + " \t\t\t (adm1021_read_value(new_client, ADM1021_REG_DEV_ID) == 0x01))\n" " \t\t\tkind = max1617a;\n" "-\t\t/* LM84 Mfr ID in a different place */\n" - "-\t\telse if (adm1021_read_value(new_client, ADM1021_REG_CONV_RATE_R) = 0x00)\n" + "-\t\telse if (adm1021_read_value(new_client, ADM1021_REG_CONV_RATE_R) == 0x00)\n" "-\t\t\tkind = lm84;\n" - " \t\telse if (i = 0x54)\n" + " \t\telse if (i == 0x54)\n" " \t\t\tkind = mc1066;\n" "+\t\t/* LM84 Mfr ID in a different place, and it has more unused bits */\n" - "+\t\telse if (adm1021_read_value(new_client, ADM1021_REG_CONV_RATE_R) = 0x00\n" - "+\t\t && (kind = 0 /* skip extra detection */\n" - "+\t\t || ((adm1021_read_value(new_client, ADM1021_REG_CONFIG_R) & 0x7F) = 0x00\n" - "+\t\t\t&& (adm1021_read_value(new_client, ADM1021_REG_STATUS) & 0xAB) = 0x00)))\n" + "+\t\telse if (adm1021_read_value(new_client, ADM1021_REG_CONV_RATE_R) == 0x00\n" + "+\t\t && (kind == 0 /* skip extra detection */\n" + "+\t\t || ((adm1021_read_value(new_client, ADM1021_REG_CONFIG_R) & 0x7F) == 0x00\n" + "+\t\t\t&& (adm1021_read_value(new_client, ADM1021_REG_STATUS) & 0xAB) == 0x00)))\n" "+\t\t\tkind = lm84;\n" " \t\telse\n" " \t\t\tkind = max1617;\n" @@ -116,4 +115,4 @@ " \t/* Register sysfs hooks */\n" " \tdevice_create_file(&new_client->dev, &dev_attr_temp1_max);" -96966665bbdcb3e64d3ec5756f423c2103ca5affddc259203c5578e4b67ee66a +52aafec7c1bdcc2b9b928aae8be7973ab3071adf3051cd107f819060346abca6
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.