diff for duplicates of <11099685933551@kroah.com> diff --git a/a/1.txt b/N1/1.txt index 757c6f6..74ec11d 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -146,7 +146,7 @@ diff -Nru a/drivers/i2c/chips/adm1026.c b/drivers/i2c/chips/adm1026.c - client->id, data->config1); + dev_dbg(&client->dev, "ADM1026_REG_CONFIG1 is: 0x%02x\n", + data->config1); - if ((data->config1 & CFG1_MONITOR) = 0) { + if ((data->config1 & CFG1_MONITOR) == 0) { - dev_dbg(&client->dev, "(%d): Monitoring not currently " - "enabled.\n", client->id); + dev_dbg(&client->dev, "Monitoring not currently " @@ -206,7 +206,7 @@ diff -Nru a/drivers/i2c/chips/adm1026.c b/drivers/i2c/chips/adm1026.c - * do it now. But only if this is the first ADM1026. + * do it now. */ -- if (client->id = 0 +- if (client->id == 0 - && (gpio_input[0] != -1 || gpio_output[0] != -1 + if (gpio_input[0] != -1 || gpio_output[0] != -1 || gpio_inverted[0] != -1 || gpio_normal[0] != -1 @@ -271,7 +271,8 @@ diff -Nru a/drivers/i2c/chips/adm1026.c b/drivers/i2c/chips/adm1026.c - client->id); + dev_dbg(&client->dev,"Reading sensor values\n"); for (i = 0;i <= 16;++i) { - data->in[i] adm1026_read_value(client, ADM1026_REG_IN[i]); + data->in[i] = + adm1026_read_value(client, ADM1026_REG_IN[i]); @@ -631,8 +623,7 @@ if (!data->valid || (jiffies - data->last_config > ADM1026_CONFIG_INTERVAL)) { diff --git a/a/content_digest b/N1/content_digest index ed258ba..381a74b 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\011099685931959@kroah.com\0" - "From\0greg@kroah.com (Greg KH)\0" + "From\0Greg KH <greg@kroah.com>\0" "Subject\0[PATCH] I2C: Kill i2c_client.id (1/5)\0" - "Date\0Thu, 19 May 2005 06:25:41 +0000\0" + "Date\0Fri, 4 Mar 2005 12:36:33 -0800\0" "To\0linux-kernel@vger.kernel.org" " sensors@stimpy.netroedge.com\0" "Cc\0khali@linux-fr.org\0" @@ -155,7 +155,7 @@ "-\t\tclient->id, data->config1);\n" "+\tdev_dbg(&client->dev, \"ADM1026_REG_CONFIG1 is: 0x%02x\\n\",\n" "+\t\tdata->config1);\n" - " \tif ((data->config1 & CFG1_MONITOR) = 0) {\n" + " \tif ((data->config1 & CFG1_MONITOR) == 0) {\n" "-\t\tdev_dbg(&client->dev, \"(%d): Monitoring not currently \"\n" "-\t\t\t\"enabled.\\n\", client->id);\n" "+\t\tdev_dbg(&client->dev, \"Monitoring not currently \"\n" @@ -215,7 +215,7 @@ "-\t * do it now. But only if this is the first ADM1026.\n" "+\t * do it now.\n" " \t */\n" - "-\tif (client->id = 0\n" + "-\tif (client->id == 0\n" "-\t && (gpio_input[0] != -1 || gpio_output[0] != -1\n" "+\tif (gpio_input[0] != -1 || gpio_output[0] != -1\n" " \t\t|| gpio_inverted[0] != -1 || gpio_normal[0] != -1\n" @@ -280,7 +280,8 @@ "-\t\t\tclient->id);\n" "+\t\tdev_dbg(&client->dev,\"Reading sensor values\\n\");\n" " \t\tfor (i = 0;i <= 16;++i) {\n" - " \t\t\tdata->in[i] \t\t\t adm1026_read_value(client, ADM1026_REG_IN[i]);\n" + " \t\t\tdata->in[i] =\n" + " \t\t\t adm1026_read_value(client, ADM1026_REG_IN[i]);\n" "@@ -631,8 +623,7 @@\n" " \tif (!data->valid || (jiffies - data->last_config > \n" " \t\tADM1026_CONFIG_INTERVAL)) {\n" @@ -723,4 +724,4 @@ " \tdata->valid = 0;\n" " \tinit_MUTEX(&data->update_lock);" -5cd6b649e09aa39b8e79984259b1ea6fffd7b208b328362b795de1b651662909 +669f0462cee75a241db0f9542b9dd786b96d64009f00d88c21020067c56d445c
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.