diff for duplicates of <10793913932514@kroah.com> diff --git a/a/1.txt b/N1/1.txt index 4577548..3ba52e7 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -214,13 +214,24 @@ diff -Nru a/drivers/i2c/chips/w83627hf.c b/drivers/i2c/chips/w83627hf.c @@ -1319,20 +1319,20 @@ data->temp = w83627hf_read_value(client, W83781D_REG_TEMP(1)); - data->temp_max w83627hf_read_value(client, W83781D_REG_TEMP_OVER(1)); -- data->temp_hyst + data->temp_max_hyst w83627hf_read_value(client, W83781D_REG_TEMP_HYST(1)); - data->temp_add[0] w83627hf_read_value(client, W83781D_REG_TEMP(2)); - data->temp_max_add[0] w83627hf_read_value(client, W83781D_REG_TEMP_OVER(2)); -- data->temp_hyst_add[0] + data->temp_max_hyst_add[0] w83627hf_read_value(client, W83781D_REG_TEMP_HYST(2)); + data->temp_max = + w83627hf_read_value(client, W83781D_REG_TEMP_OVER(1)); +- data->temp_hyst = ++ data->temp_max_hyst = + w83627hf_read_value(client, W83781D_REG_TEMP_HYST(1)); + data->temp_add[0] = + w83627hf_read_value(client, W83781D_REG_TEMP(2)); + data->temp_max_add[0] = + w83627hf_read_value(client, W83781D_REG_TEMP_OVER(2)); +- data->temp_hyst_add[0] = ++ data->temp_max_hyst_add[0] = + w83627hf_read_value(client, W83781D_REG_TEMP_HYST(2)); if (data->type != w83697hf) { - data->temp_add[1] w83627hf_read_value(client, W83781D_REG_TEMP(3)); - data->temp_max_add[1] w83627hf_read_value(client, W83781D_REG_TEMP_OVER(3)); -- data->temp_hyst_add[1] + data->temp_max_hyst_add[1] w83627hf_read_value(client, W83781D_REG_TEMP_HYST(3)); + data->temp_add[1] = + w83627hf_read_value(client, W83781D_REG_TEMP(3)); + data->temp_max_add[1] = + w83627hf_read_value(client, W83781D_REG_TEMP_OVER(3)); +- data->temp_hyst_add[1] = ++ data->temp_max_hyst_add[1] = + w83627hf_read_value(client, W83781D_REG_TEMP_HYST(3)); } diff --git a/a/content_digest b/N1/content_digest index 2734920..1fd527a 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,7 @@ "ref\010793913932181@kroah.com\0" - "ref\010793913903814@kroah.com\0" - "From\0greg@kroah.com (Greg KH)\0" - "Subject\0[PATCH] i2c driver fixes for 2.6.4\0" - "Date\0Thu, 19 May 2005 06:24:48 +0000\0" + "From\0Greg KH <greg@kroah.com>\0" + "Subject\0Re: [PATCH] i2c driver fixes for 2.6.4\0" + "Date\0Mon, 15 Mar 2004 14:56:33 -0800\0" "To\0linux-kernel@vger.kernel.org" " sensors@stimpy.netroedge.com\0" "\00:1\0" @@ -223,15 +222,26 @@ " \n" "@@ -1319,20 +1319,20 @@\n" " \t\tdata->temp = w83627hf_read_value(client, W83781D_REG_TEMP(1));\n" - " \t\tdata->temp_max \t\t w83627hf_read_value(client, W83781D_REG_TEMP_OVER(1));\n" - "-\t\tdata->temp_hyst +\t\tdata->temp_max_hyst \t\t w83627hf_read_value(client, W83781D_REG_TEMP_HYST(1));\n" - " \t\tdata->temp_add[0] \t\t w83627hf_read_value(client, W83781D_REG_TEMP(2));\n" - " \t\tdata->temp_max_add[0] \t\t w83627hf_read_value(client, W83781D_REG_TEMP_OVER(2));\n" - "-\t\tdata->temp_hyst_add[0] +\t\tdata->temp_max_hyst_add[0] \t\t w83627hf_read_value(client, W83781D_REG_TEMP_HYST(2));\n" + " \t\tdata->temp_max =\n" + " \t\t w83627hf_read_value(client, W83781D_REG_TEMP_OVER(1));\n" + "-\t\tdata->temp_hyst =\n" + "+\t\tdata->temp_max_hyst =\n" + " \t\t w83627hf_read_value(client, W83781D_REG_TEMP_HYST(1));\n" + " \t\tdata->temp_add[0] =\n" + " \t\t w83627hf_read_value(client, W83781D_REG_TEMP(2));\n" + " \t\tdata->temp_max_add[0] =\n" + " \t\t w83627hf_read_value(client, W83781D_REG_TEMP_OVER(2));\n" + "-\t\tdata->temp_hyst_add[0] =\n" + "+\t\tdata->temp_max_hyst_add[0] =\n" + " \t\t w83627hf_read_value(client, W83781D_REG_TEMP_HYST(2));\n" " \t\tif (data->type != w83697hf) {\n" - " \t\t\tdata->temp_add[1] \t\t\t w83627hf_read_value(client, W83781D_REG_TEMP(3));\n" - " \t\t\tdata->temp_max_add[1] \t\t\t w83627hf_read_value(client, W83781D_REG_TEMP_OVER(3));\n" - "-\t\t\tdata->temp_hyst_add[1] +\t\t\tdata->temp_max_hyst_add[1] \t\t\t w83627hf_read_value(client, W83781D_REG_TEMP_HYST(3));\n" + " \t\t\tdata->temp_add[1] =\n" + " \t\t\t w83627hf_read_value(client, W83781D_REG_TEMP(3));\n" + " \t\t\tdata->temp_max_add[1] =\n" + " \t\t\t w83627hf_read_value(client, W83781D_REG_TEMP_OVER(3));\n" + "-\t\t\tdata->temp_hyst_add[1] =\n" + "+\t\t\tdata->temp_max_hyst_add[1] =\n" + " \t\t\t w83627hf_read_value(client, W83781D_REG_TEMP_HYST(3));\n" " \t\t}" -6e24fe4f5668cad12ba00514de4fccad4ecf53a1f7203bad472a69687bce5ae7 +5fc2050fc554e28e0e18ba12969dc4037488ae5fc536b9be89368e37d5ada69f
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.