diff for duplicates of <10728219692713@kroah.com> diff --git a/a/1.txt b/N1/1.txt index 4e9b49e..236e6f5 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -337,8 +337,8 @@ diff -Nru a/drivers/i2c/chips/lm83.c b/drivers/i2c/chips/lm83.c + LM83_REG_R_MAN_ID); + chip_id = i2c_smbus_read_byte_data(new_client, + LM83_REG_R_CHIP_ID); -+ if (man_id = 0x01) { /* National Semiconductor */ -+ if (chip_id = 0x03) { ++ if (man_id == 0x01) { /* National Semiconductor */ ++ if (chip_id == 0x03) { + kind = lm83; + name = "lm83"; + } @@ -422,13 +422,17 @@ diff -Nru a/drivers/i2c/chips/lm83.c b/drivers/i2c/chips/lm83.c + int nr; + dev_dbg(&client->dev, "Updating lm83 data.\n"); + for (nr = 0; nr < 4 ; nr++) { -+ data->temp_input[nr] + i2c_smbus_read_byte_data(client, ++ data->temp_input[nr] = ++ i2c_smbus_read_byte_data(client, + LM83_REG_R_TEMP[nr]); -+ data->temp_high[nr] + i2c_smbus_read_byte_data(client, ++ data->temp_high[nr] = ++ i2c_smbus_read_byte_data(client, + LM83_REG_R_HIGH[nr]); + } -+ data->temp_crit + i2c_smbus_read_byte_data(client, LM83_REG_R_TCRIT); -+ data->alarms + i2c_smbus_read_byte_data(client, LM83_REG_R_STATUS1) ++ data->temp_crit = ++ i2c_smbus_read_byte_data(client, LM83_REG_R_TCRIT); ++ data->alarms = ++ i2c_smbus_read_byte_data(client, LM83_REG_R_STATUS1) + + (i2c_smbus_read_byte_data(client, LM83_REG_R_STATUS2) + << 8); + data->last_updated = jiffies; diff --git a/a/content_digest b/N1/content_digest index 89362a0..2edca66 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020031230220257.GA2408@kroah.com\0" - "From\0greg@kroah.com (Greg KH)\0" + "From\0Greg KH <greg@kroah.com>\0" "Subject\0[PATCH] i2c driver fixes for 2.6.0\0" - "Date\0Thu, 19 May 2005 06:24:31 +0000\0" + "Date\0Tue, 30 Dec 2003 14:06:09 -0800\0" "To\0linux-kernel@vger.kernel.org" " sensors@stimpy.netroedge.com\0" "\00:1\0" @@ -345,8 +345,8 @@ "+\t\t LM83_REG_R_MAN_ID);\n" "+\t\tchip_id = i2c_smbus_read_byte_data(new_client,\n" "+\t\t LM83_REG_R_CHIP_ID);\n" - "+\t\tif (man_id = 0x01) { /* National Semiconductor */\n" - "+\t\t\tif (chip_id = 0x03) {\n" + "+\t\tif (man_id == 0x01) { /* National Semiconductor */\n" + "+\t\t\tif (chip_id == 0x03) {\n" "+\t\t\t\tkind = lm83;\n" "+\t\t\t\tname = \"lm83\";\n" "+\t\t\t}\n" @@ -430,13 +430,17 @@ "+\t\tint nr;\n" "+\t\tdev_dbg(&client->dev, \"Updating lm83 data.\\n\");\n" "+\t\tfor (nr = 0; nr < 4 ; nr++) {\n" - "+\t\t\tdata->temp_input[nr] +\t\t\t i2c_smbus_read_byte_data(client,\n" + "+\t\t\tdata->temp_input[nr] =\n" + "+\t\t\t i2c_smbus_read_byte_data(client,\n" "+\t\t\t LM83_REG_R_TEMP[nr]);\n" - "+\t\t\tdata->temp_high[nr] +\t\t\t i2c_smbus_read_byte_data(client,\n" + "+\t\t\tdata->temp_high[nr] =\n" + "+\t\t\t i2c_smbus_read_byte_data(client,\n" "+\t\t\t LM83_REG_R_HIGH[nr]);\n" "+\t\t}\n" - "+\t\tdata->temp_crit +\t\t i2c_smbus_read_byte_data(client, LM83_REG_R_TCRIT);\n" - "+\t\tdata->alarms +\t\t i2c_smbus_read_byte_data(client, LM83_REG_R_STATUS1)\n" + "+\t\tdata->temp_crit =\n" + "+\t\t i2c_smbus_read_byte_data(client, LM83_REG_R_TCRIT);\n" + "+\t\tdata->alarms =\n" + "+\t\t i2c_smbus_read_byte_data(client, LM83_REG_R_STATUS1)\n" "+\t\t + (i2c_smbus_read_byte_data(client, LM83_REG_R_STATUS2)\n" "+\t\t << 8);\n" "+\t\tdata->last_updated = jiffies;\n" @@ -474,4 +478,4 @@ " /*\n" * ---- Adapter types ---------------------------------------------------- -812ffa6d8ac0bf3ea18eaa395b8ff043cb9caacd442fc6e0e8b84b2fb464988b +c180dadb862b73dbc15e4eda081bd249754f3ede59563a86f3d84a23c882029b
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.