diff for duplicates of <10728219741342@kroah.com> diff --git a/a/1.txt b/N1/1.txt index 785aa50..47a6742 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -255,16 +255,27 @@ diff -Nru a/drivers/i2c/chips/w83781d.c b/drivers/i2c/chips/w83781d.c } data->temp = w83781d_read_value(client, W83781D_REG_TEMP(1)); -- data->temp_min - w83781d_read_value(client, W83781D_REG_TEMP_OVER(1)); - data->temp_max + w83781d_read_value(client, W83781D_REG_TEMP_OVER(1)); -+ data->temp_hyst w83781d_read_value(client, W83781D_REG_TEMP_HYST(1)); - data->temp_add[0] w83781d_read_value(client, W83781D_REG_TEMP(2)); - data->temp_max_add[0] w83781d_read_value(client, W83781D_REG_TEMP_OVER(2)); -- data->temp_min_add[0] + data->temp_hyst_add[0] w83781d_read_value(client, W83781D_REG_TEMP_HYST(2)); +- data->temp_min = +- w83781d_read_value(client, W83781D_REG_TEMP_OVER(1)); + data->temp_max = ++ w83781d_read_value(client, W83781D_REG_TEMP_OVER(1)); ++ data->temp_hyst = + w83781d_read_value(client, W83781D_REG_TEMP_HYST(1)); + data->temp_add[0] = + w83781d_read_value(client, W83781D_REG_TEMP(2)); + data->temp_max_add[0] = + w83781d_read_value(client, W83781D_REG_TEMP_OVER(2)); +- data->temp_min_add[0] = ++ data->temp_hyst_add[0] = + w83781d_read_value(client, W83781D_REG_TEMP_HYST(2)); if (data->type != w83783s && data->type != w83697hf) { - data->temp_add[1] @@ -1881,7 +1881,7 @@ - data->temp_max_add[1] w83781d_read_value(client, + data->temp_add[1] = +@@ -1881,7 +1881,7 @@ + data->temp_max_add[1] = + w83781d_read_value(client, W83781D_REG_TEMP_OVER(3)); -- data->temp_min_add[1] + data->temp_hyst_add[1] w83781d_read_value(client, +- data->temp_min_add[1] = ++ data->temp_hyst_add[1] = + w83781d_read_value(client, W83781D_REG_TEMP_HYST(3)); } diff --git a/a/content_digest b/N1/content_digest index 421bf0c..fd359a2 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,7 @@ "ref\010728219731748@kroah.com\0" - "ref\010728219692713@kroah.com\0" - "From\0greg@kroah.com (Greg KH)\0" - "Subject\0[PATCH] i2c driver fixes for 2.6.0\0" - "Date\0Thu, 19 May 2005 06:24:32 +0000\0" + "From\0Greg KH <greg@kroah.com>\0" + "Subject\0Re: [PATCH] i2c driver fixes for 2.6.0\0" + "Date\0Tue, 30 Dec 2003 14:06:14 -0800\0" "To\0linux-kernel@vger.kernel.org" " sensors@stimpy.netroedge.com\0" "\00:1\0" @@ -264,18 +263,29 @@ " \t\t}\n" " \n" " \t\tdata->temp = w83781d_read_value(client, W83781D_REG_TEMP(1));\n" - "-\t\tdata->temp_min -\t\t w83781d_read_value(client, W83781D_REG_TEMP_OVER(1));\n" - " \t\tdata->temp_max +\t\t w83781d_read_value(client, W83781D_REG_TEMP_OVER(1));\n" - "+\t\tdata->temp_hyst \t\t w83781d_read_value(client, W83781D_REG_TEMP_HYST(1));\n" - " \t\tdata->temp_add[0] \t\t w83781d_read_value(client, W83781D_REG_TEMP(2));\n" - " \t\tdata->temp_max_add[0] \t\t w83781d_read_value(client, W83781D_REG_TEMP_OVER(2));\n" - "-\t\tdata->temp_min_add[0] +\t\tdata->temp_hyst_add[0] \t\t w83781d_read_value(client, W83781D_REG_TEMP_HYST(2));\n" + "-\t\tdata->temp_min =\n" + "-\t\t w83781d_read_value(client, W83781D_REG_TEMP_OVER(1));\n" + " \t\tdata->temp_max =\n" + "+\t\t w83781d_read_value(client, W83781D_REG_TEMP_OVER(1));\n" + "+\t\tdata->temp_hyst =\n" + " \t\t w83781d_read_value(client, W83781D_REG_TEMP_HYST(1));\n" + " \t\tdata->temp_add[0] =\n" + " \t\t w83781d_read_value(client, W83781D_REG_TEMP(2));\n" + " \t\tdata->temp_max_add[0] =\n" + " \t\t w83781d_read_value(client, W83781D_REG_TEMP_OVER(2));\n" + "-\t\tdata->temp_min_add[0] =\n" + "+\t\tdata->temp_hyst_add[0] =\n" + " \t\t w83781d_read_value(client, W83781D_REG_TEMP_HYST(2));\n" " \t\tif (data->type != w83783s && data->type != w83697hf) {\n" - " \t\t\tdata->temp_add[1] @@ -1881,7 +1881,7 @@\n" - " \t\t\tdata->temp_max_add[1] \t\t\t w83781d_read_value(client,\n" + " \t\t\tdata->temp_add[1] =\n" + "@@ -1881,7 +1881,7 @@\n" + " \t\t\tdata->temp_max_add[1] =\n" + " \t\t\t w83781d_read_value(client,\n" " \t\t\t\t\t W83781D_REG_TEMP_OVER(3));\n" - "-\t\t\tdata->temp_min_add[1] +\t\t\tdata->temp_hyst_add[1] \t\t\t w83781d_read_value(client,\n" + "-\t\t\tdata->temp_min_add[1] =\n" + "+\t\t\tdata->temp_hyst_add[1] =\n" + " \t\t\t w83781d_read_value(client,\n" " \t\t\t\t\t W83781D_REG_TEMP_HYST(3));\n" " \t\t}" -56089cc022ee0363bf2a94e0ac2864386c18ecab91f981bd3c128737468fdef8 +ff60d61ed854a9f9522750e3be2fa9ef3fef8552e63b402355e4b47fed0bde31
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.