diff for duplicates of <10525245943581@kroah.com> diff --git a/a/1.txt b/N1/1.txt index 2f6e677..4675284 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -154,12 +154,12 @@ diff -Nru a/drivers/i2c/chips/it87.c b/drivers/i2c/chips/it87.c case 0: case 1: @@ -508,6 +522,11 @@ - if (data->fan_div[2] = 3) + if (data->fan_div[2] == 3) val |= 0x1 << 6; it87_write_value(client, IT87_REG_FAN_DIV, val); + + for (i = 0; i < 3; i++) { -+ data->fan_min[i]úN_TO_REG(min[i], DIV_FROM_REG(data->fan_div[i])); ++ data->fan_min[i]=FAN_TO_REG(min[i], DIV_FROM_REG(data->fan_div[i])); + it87_write_value(client, IT87_REG_FAN_MIN(i), data->fan_min[i]); + } return count; @@ -219,13 +219,23 @@ diff -Nru a/drivers/i2c/chips/it87.c b/drivers/i2c/chips/it87.c data->in_max[8] = 255; - for (i = 1; i <= 3; i++) { -- data->fan[i - 1] + for (i = 0; i < 3; i++) { -+ data->fan[i] it87_read_value(client, IT87_REG_FAN(i)); -- data->fan_min[i - 1] + data->fan_min[i] it87_read_value(client, IT87_REG_FAN_MIN(i)); +- data->fan[i - 1] = ++ for (i = 0; i < 3; i++) { ++ data->fan[i] = + it87_read_value(client, IT87_REG_FAN(i)); +- data->fan_min[i - 1] = ++ data->fan_min[i] = + it87_read_value(client, IT87_REG_FAN_MIN(i)); } - for (i = 1; i <= 3; i++) { -- data->temp[i - 1] + for (i = 0; i < 3; i++) { -+ data->temp[i] it87_read_value(client, IT87_REG_TEMP(i)); -- data->temp_high[i - 1] + data->temp_high[i] it87_read_value(client, IT87_REG_TEMP_HIGH(i)); -- data->temp_low[i - 1] + data->temp_low[i] it87_read_value(client, IT87_REG_TEMP_LOW(i)); +- data->temp[i - 1] = ++ for (i = 0; i < 3; i++) { ++ data->temp[i] = + it87_read_value(client, IT87_REG_TEMP(i)); +- data->temp_high[i - 1] = ++ data->temp_high[i] = + it87_read_value(client, IT87_REG_TEMP_HIGH(i)); +- data->temp_low[i - 1] = ++ data->temp_low[i] = + it87_read_value(client, IT87_REG_TEMP_LOW(i)); } diff --git a/a/content_digest b/N1/content_digest index 9196fb4..2ec4637 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,7 @@ "ref\010525245943373@kroah.com\0" - "ref\01048295086481@kroah.com\0" - "From\0greg@kroah.com (Greg KH)\0" - "Subject\0[PATCH] More i2c driver changes for 2.5.69\0" - "Date\0Thu, 19 May 2005 06:23:56 +0000\0" + "From\0Greg KH <greg@kroah.com>\0" + "Subject\0Re: [PATCH] More i2c driver changes for 2.5.69\0" + "Date\0Fri, 9 May 2003 16:56:34 -0700\0" "To\0linux-kernel@vger.kernel.org" " sensors@stimpy.netroedge.com\0" "\00:1\0" @@ -163,12 +162,12 @@ " \tcase 0:\n" " \tcase 1:\n" "@@ -508,6 +522,11 @@\n" - " \tif (data->fan_div[2] = 3)\n" + " \tif (data->fan_div[2] == 3)\n" " \t\tval |= 0x1 << 6;\n" " \tit87_write_value(client, IT87_REG_FAN_DIV, val);\n" "+\n" "+\tfor (i = 0; i < 3; i++) {\n" - "+\t\tdata->fan_min[i]\303\272N_TO_REG(min[i], DIV_FROM_REG(data->fan_div[i]));\n" + "+\t\tdata->fan_min[i]=FAN_TO_REG(min[i], DIV_FROM_REG(data->fan_div[i]));\n" "+\t\tit87_write_value(client, IT87_REG_FAN_MIN(i), data->fan_min[i]);\n" "+\t}\n" " \treturn count;\n" @@ -228,15 +227,25 @@ " \t\tdata->in_max[8] = 255;\n" " \n" "-\t\tfor (i = 1; i <= 3; i++) {\n" - "-\t\t\tdata->fan[i - 1] +\t\tfor (i = 0; i < 3; i++) {\n" - "+\t\t\tdata->fan[i] \t\t\t it87_read_value(client, IT87_REG_FAN(i));\n" - "-\t\t\tdata->fan_min[i - 1] +\t\t\tdata->fan_min[i] \t\t\t it87_read_value(client, IT87_REG_FAN_MIN(i));\n" + "-\t\t\tdata->fan[i - 1] =\n" + "+\t\tfor (i = 0; i < 3; i++) {\n" + "+\t\t\tdata->fan[i] =\n" + " \t\t\t it87_read_value(client, IT87_REG_FAN(i));\n" + "-\t\t\tdata->fan_min[i - 1] =\n" + "+\t\t\tdata->fan_min[i] =\n" + " \t\t\t it87_read_value(client, IT87_REG_FAN_MIN(i));\n" " \t\t}\n" "-\t\tfor (i = 1; i <= 3; i++) {\n" - "-\t\t\tdata->temp[i - 1] +\t\tfor (i = 0; i < 3; i++) {\n" - "+\t\t\tdata->temp[i] \t\t\t it87_read_value(client, IT87_REG_TEMP(i));\n" - "-\t\t\tdata->temp_high[i - 1] +\t\t\tdata->temp_high[i] \t\t\t it87_read_value(client, IT87_REG_TEMP_HIGH(i));\n" - "-\t\t\tdata->temp_low[i - 1] +\t\t\tdata->temp_low[i] \t\t\t it87_read_value(client, IT87_REG_TEMP_LOW(i));\n" + "-\t\t\tdata->temp[i - 1] =\n" + "+\t\tfor (i = 0; i < 3; i++) {\n" + "+\t\t\tdata->temp[i] =\n" + " \t\t\t it87_read_value(client, IT87_REG_TEMP(i));\n" + "-\t\t\tdata->temp_high[i - 1] =\n" + "+\t\t\tdata->temp_high[i] =\n" + " \t\t\t it87_read_value(client, IT87_REG_TEMP_HIGH(i));\n" + "-\t\t\tdata->temp_low[i - 1] =\n" + "+\t\t\tdata->temp_low[i] =\n" + " \t\t\t it87_read_value(client, IT87_REG_TEMP_LOW(i));\n" " \t\t}" -18d4de81740860ce025a71c9102ae1abaf90be90d7b5efbe5b3ad177888f01bf +365d1104cc0a6b892e45202ff35420240af4800ee1f047fcd4830ce0aac196bb
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.