diff for duplicates of <11059983952608@kroah.com> diff --git a/a/1.txt b/N1/1.txt index dcd4c03..4d69226 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -110,7 +110,7 @@ diff -Nru a/drivers/i2c/chips/it87.c b/drivers/i2c/chips/it87.c + struct it87_data *data = i2c_get_clientdata(client); + int val = simple_strtol(buf, NULL, 10); + -+ if (val = 0) { ++ if (val == 0) { + int tmp; + /* make sure the fan is on when in on/off mode */ + tmp = it87_read_value(client, IT87_REG_FAN_CTL); @@ -118,7 +118,7 @@ diff -Nru a/drivers/i2c/chips/it87.c b/drivers/i2c/chips/it87.c + /* set on/off mode */ + data->fan_main_ctrl &= ~(1 << nr); + it87_write_value(client, IT87_REG_FAN_MAIN_CTRL, data->fan_main_ctrl); -+ } else if (val = 1) { ++ } else if (val == 1) { + /* set SmartGuardian mode */ + data->fan_main_ctrl |= (1 << nr); + it87_write_value(client, IT87_REG_FAN_MAIN_CTRL, data->fan_main_ctrl); @@ -196,7 +196,7 @@ diff -Nru a/drivers/i2c/chips/it87.c b/drivers/i2c/chips/it87.c + device_create_file(&new_client->dev, &dev_attr_pwm2); + device_create_file(&new_client->dev, &dev_attr_pwm3); - if (data->type = it8712) { + if (data->type == it8712) { device_create_file_vrm(new_client); @@ -851,12 +943,17 @@ /* Called when we have found a new IT87. */ @@ -226,9 +226,9 @@ diff -Nru a/drivers/i2c/chips/it87.c b/drivers/i2c/chips/it87.c /* Check if tachometers are reset manually or by some reason */ - tmp = it87_read_value(client, IT87_REG_FAN_MAIN_CTRL); -- if ((tmp & 0x70) = 0) { +- if ((tmp & 0x70) == 0) { + data->fan_main_ctrl = it87_read_value(client, IT87_REG_FAN_MAIN_CTRL); -+ if ((data->fan_main_ctrl & 0x70) = 0) { ++ if ((data->fan_main_ctrl & 0x70) == 0) { /* Enable all fan tachometers */ - tmp = (tmp & 0x8f) | 0x70; - it87_write_value(client, IT87_REG_FAN_MAIN_CTRL, tmp); diff --git a/a/content_digest b/N1/content_digest index b1390e1..f0ed907 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\01105998395759@kroah.com\0" - "From\0greg@kroah.com (Greg KH)\0" + "From\0Greg KH <greg@kroah.com>\0" "Subject\0[PATCH] I2C: it87 fan update\0" - "Date\0Thu, 19 May 2005 06:25:31 +0000\0" + "Date\0Mon, 17 Jan 2005 13:46:35 -0800\0" "To\0linux-kernel@vger.kernel.org" " sensors@stimpy.netroedge.com\0" "Cc\0jmunsin@iki.fi\0" @@ -119,7 +119,7 @@ "+\tstruct it87_data *data = i2c_get_clientdata(client);\n" "+\tint val = simple_strtol(buf, NULL, 10);\n" "+\n" - "+\tif (val = 0) {\n" + "+\tif (val == 0) {\n" "+\t\tint tmp;\n" "+\t\t/* make sure the fan is on when in on/off mode */\n" "+\t\ttmp = it87_read_value(client, IT87_REG_FAN_CTL);\n" @@ -127,7 +127,7 @@ "+\t\t/* set on/off mode */\n" "+\t\tdata->fan_main_ctrl &= ~(1 << nr);\n" "+\t\tit87_write_value(client, IT87_REG_FAN_MAIN_CTRL, data->fan_main_ctrl);\n" - "+\t} else if (val = 1) {\n" + "+\t} else if (val == 1) {\n" "+\t\t/* set SmartGuardian mode */\n" "+\t\tdata->fan_main_ctrl |= (1 << nr);\n" "+\t\tit87_write_value(client, IT87_REG_FAN_MAIN_CTRL, data->fan_main_ctrl);\n" @@ -205,7 +205,7 @@ "+\tdevice_create_file(&new_client->dev, &dev_attr_pwm2);\n" "+\tdevice_create_file(&new_client->dev, &dev_attr_pwm3);\n" " \n" - " \tif (data->type = it8712) {\n" + " \tif (data->type == it8712) {\n" " \t\tdevice_create_file_vrm(new_client);\n" "@@ -851,12 +943,17 @@\n" " /* Called when we have found a new IT87. */\n" @@ -235,9 +235,9 @@ " \n" " \t/* Check if tachometers are reset manually or by some reason */\n" "-\ttmp = it87_read_value(client, IT87_REG_FAN_MAIN_CTRL);\n" - "-\tif ((tmp & 0x70) = 0) {\n" + "-\tif ((tmp & 0x70) == 0) {\n" "+\tdata->fan_main_ctrl = it87_read_value(client, IT87_REG_FAN_MAIN_CTRL);\n" - "+\tif ((data->fan_main_ctrl & 0x70) = 0) {\n" + "+\tif ((data->fan_main_ctrl & 0x70) == 0) {\n" " \t\t/* Enable all fan tachometers */\n" "-\t\ttmp = (tmp & 0x8f) | 0x70;\n" "-\t\tit87_write_value(client, IT87_REG_FAN_MAIN_CTRL, tmp);\n" @@ -284,4 +284,4 @@ " \n" module_init(sm_it87_init); -a728ee0c50012279399b9c34c49de39c9448795d368e5609bd667f777a8df481 +69978706d09b85615fdb611ce6d3d4d4cfc280743eb93e65bd5cedba6362a2ea
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.