diff for duplicates of <10819814531232@kroah.com> diff --git a/a/1.txt b/N1/1.txt index 610fb3a..0ee7a38 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -69,7 +69,7 @@ diff -Nru a/drivers/i2c/chips/w83781d.c b/drivers/i2c/chips/w83781d.c val = simple_strtoul(buf, NULL, 10); - /* only PWM2 can be enabled/disabled */ -- if (nr = 2) { +- if (nr == 2) { - j = w83781d_read_value(client, W83781D_REG_PWMCLK12); - k = w83781d_read_value(client, W83781D_REG_BEEP_CONFIG); - @@ -143,22 +143,24 @@ diff -Nru a/drivers/i2c/chips/w83781d.c b/drivers/i2c/chips/w83781d.c } @@ -1624,20 +1610,19 @@ - data->fan_min[i - 1] w83781d_read_value(client, W83781D_REG_FAN_MIN(i)); + data->fan_min[i - 1] = + w83781d_read_value(client, W83781D_REG_FAN_MIN(i)); } - if (data->type != w83781d) { + if (data->type != w83781d && data->type != as99127f) { for (i = 1; i <= 4; i++) { - data->pwm[i - 1] w83781d_read_value(client, + data->pwm[i - 1] = + w83781d_read_value(client, W83781D_REG_PWM(i)); -- if (((data->type = w83783s) -- || (data->type = w83627hf) -- || (data->type = as99127f) -- || (data->type = w83697hf) -- || ((data->type = w83782d) +- if (((data->type == w83783s) +- || (data->type == w83627hf) +- || (data->type == as99127f) +- || (data->type == w83697hf) +- || ((data->type == w83782d) - && i2c_is_isa_client(client))) + if ((data->type != w83782d + || i2c_is_isa_client(client)) - && i = 2) + && i == 2) break; } + /* Only PWM2 can be disabled */ diff --git a/a/content_digest b/N1/content_digest index 3542f7d..d583454 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,7 @@ "ref\010819814521837@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:53 +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:13 -0700\0" "To\0linux-kernel@vger.kernel.org" " sensors@stimpy.netroedge.com\0" "\00:1\0" @@ -78,7 +77,7 @@ " \tval = simple_strtoul(buf, NULL, 10);\n" " \n" "-\t/* only PWM2 can be enabled/disabled */\n" - "-\tif (nr = 2) {\n" + "-\tif (nr == 2) {\n" "-\t\tj = w83781d_read_value(client, W83781D_REG_PWMCLK12);\n" "-\t\tk = w83781d_read_value(client, W83781D_REG_BEEP_CONFIG);\n" "-\n" @@ -152,22 +151,24 @@ " \t}\n" " \n" "@@ -1624,20 +1610,19 @@\n" - " \t\t\tdata->fan_min[i - 1] \t\t\t w83781d_read_value(client, W83781D_REG_FAN_MIN(i));\n" + " \t\t\tdata->fan_min[i - 1] =\n" + " \t\t\t w83781d_read_value(client, W83781D_REG_FAN_MIN(i));\n" " \t\t}\n" "-\t\tif (data->type != w83781d) {\n" "+\t\tif (data->type != w83781d && data->type != as99127f) {\n" " \t\t\tfor (i = 1; i <= 4; i++) {\n" - " \t\t\t\tdata->pwm[i - 1] \t\t\t\t w83781d_read_value(client,\n" + " \t\t\t\tdata->pwm[i - 1] =\n" + " \t\t\t\t w83781d_read_value(client,\n" " \t\t\t\t\t\t W83781D_REG_PWM(i));\n" - "-\t\t\t\tif (((data->type = w83783s)\n" - "-\t\t\t\t || (data->type = w83627hf)\n" - "-\t\t\t\t || (data->type = as99127f)\n" - "-\t\t\t\t || (data->type = w83697hf)\n" - "-\t\t\t\t || ((data->type = w83782d)\n" + "-\t\t\t\tif (((data->type == w83783s)\n" + "-\t\t\t\t || (data->type == w83627hf)\n" + "-\t\t\t\t || (data->type == as99127f)\n" + "-\t\t\t\t || (data->type == w83697hf)\n" + "-\t\t\t\t || ((data->type == w83782d)\n" "-\t\t\t\t\t && i2c_is_isa_client(client)))\n" "+\t\t\t\tif ((data->type != w83782d\n" "+\t\t\t\t || i2c_is_isa_client(client))\n" - " \t\t\t\t && i = 2)\n" + " \t\t\t\t && i == 2)\n" " \t\t\t\t\tbreak;\n" " \t\t\t}\n" "+\t\t\t/* Only PWM2 can be disabled */\n" @@ -177,4 +178,4 @@ " \n" " \t\tdata->temp = w83781d_read_value(client, W83781D_REG_TEMP(1));" -5945fe487c7b612e2e4f605ae1996fb4a774822d172be586980005b8437c7f4a +bc33d492d6f4b53388a3338510bd87d37a7902d97b7aa97b28a09e1d9da0790d
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.