diff for duplicates of <11051627762271@kroah.com> diff --git a/a/1.txt b/N1/1.txt index d3df125..fa99635 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -98,11 +98,11 @@ 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) { + /* 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); @@ -180,7 +180,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 +939,17 @@ /* Called when we have found a new IT87. */ @@ -210,9 +210,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 0590d89..88f2e0f 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,7 @@ "ref\011051627762989@kroah.com\0" - "ref\011051627731563@kroah.com\0" - "From\0greg@kroah.com (Greg KH)\0" - "Subject\0[PATCH] I2C patches for 2.6.10\0" - "Date\0Thu, 19 May 2005 06:25:30 +0000\0" + "From\0Greg KH <greg@kroah.com>\0" + "Subject\0Re: [PATCH] I2C patches for 2.6.10\0" + "Date\0Fri, 7 Jan 2005 21:39:36 -0800\0" "To\0linux-kernel@vger.kernel.org" " sensors@stimpy.netroedge.com\0" "\00:1\0" @@ -107,11 +106,11 @@ "+\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\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" @@ -189,7 +188,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 +939,17 @@\n" " /* Called when we have found a new IT87. */\n" @@ -219,9 +218,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" @@ -264,4 +263,4 @@ " \n" module_init(sm_it87_init); -66bd9b3f74deac64274746fa4ff5c0eeb2d56344fecd8d00af692ccdee66fb63 +5d935a1eed5814218750cc404cbf7dfec08a036adaa71532dc102d7c3cf9db7a
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.