diff for duplicates of <1435627870-12249-4-git-send-email-hpeter+linux_kernel@gmail.com> diff --git a/a/1.txt b/N1/1.txt index e6bdbef..82757f1 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -28,17 +28,23 @@ index c065aec..41fdccf 100644 if (time_after(jiffies, data->last_limits + 60 * HZ) || !data->valid) { if (f71882fg_has_in1_alarm[data->type]) { -- data->in1_max - f71882fg_read8(data, F71882FG_REG_IN1_HIGH); -- data->in_beep - f71882fg_read8(data, F71882FG_REG_IN_BEEP); -+ if (data->type = f81866a) { -+ data->in1_max + f71882fg_read8(data, +- data->in1_max = +- f71882fg_read8(data, F71882FG_REG_IN1_HIGH); +- data->in_beep = +- f71882fg_read8(data, F71882FG_REG_IN_BEEP); ++ if (data->type == f81866a) { ++ data->in1_max = ++ f71882fg_read8(data, + F81866_REG_IN1_HIGH); -+ data->in_beep + f71882fg_read8(data, ++ data->in_beep = ++ f71882fg_read8(data, + F81866_REG_IN_BEEP); + } else { -+ data->in1_max + f71882fg_read8(data, ++ data->in1_max = ++ f71882fg_read8(data, + F71882FG_REG_IN1_HIGH); -+ data->in_beep + f71882fg_read8(data, ++ data->in_beep = ++ f71882fg_read8(data, + F71882FG_REG_IN_BEEP); + } } @@ -51,7 +57,7 @@ index c065aec..41fdccf 100644 - if (f71882fg_has_in1_alarm[data->type]) - data->in_status = f71882fg_read8(data, + if (f71882fg_has_in1_alarm[data->type]) { -+ if (data->type = f81866a) ++ if (data->type == f81866a) + data->in_status = f71882fg_read8(data, + F81866_REG_IN_STATUS); + @@ -68,7 +74,7 @@ index c065aec..41fdccf 100644 mutex_lock(&data->update_lock); - f71882fg_write8(data, F71882FG_REG_IN1_HIGH, val); -+ if (data->type = f81866a) ++ if (data->type == f81866a) + f71882fg_write8(data, F81866_REG_IN1_HIGH, val); + else + f71882fg_write8(data, F71882FG_REG_IN1_HIGH, val); @@ -80,7 +86,7 @@ index c065aec..41fdccf 100644 mutex_lock(&data->update_lock); - data->in_beep = f71882fg_read8(data, F71882FG_REG_IN_BEEP); -+ if (data->type = f81866a) ++ if (data->type == f81866a) + data->in_beep = f71882fg_read8(data, F81866_REG_IN_BEEP); + else + data->in_beep = f71882fg_read8(data, F71882FG_REG_IN_BEEP); @@ -91,7 +97,7 @@ index c065aec..41fdccf 100644 data->in_beep &= ~(1 << nr); - f71882fg_write8(data, F71882FG_REG_IN_BEEP, data->in_beep); -+ if (data->type = f81866a) ++ if (data->type == f81866a) + f71882fg_write8(data, F81866_REG_IN_BEEP, data->in_beep); + else + f71882fg_write8(data, F71882FG_REG_IN_BEEP, data->in_beep); @@ -100,9 +106,3 @@ index c065aec..41fdccf 100644 return count; -- 1.9.1 - - -_______________________________________________ -lm-sensors mailing list -lm-sensors@lm-sensors.org -http://lists.lm-sensors.org/mailman/listinfo/lm-sensors diff --git a/a/content_digest b/N1/content_digest index 349d893..10d5c88 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\01435627870-12249-1-git-send-email-hpeter+linux_kernel@gmail.com\0" "From\0Peter Hung <hpeter@gmail.com>\0" - "Subject\0[lm-sensors] [PATCH V2 3/3] hwmon:f71882fg fix f81866a voltage protection\0" - "Date\0Tue, 30 Jun 2015 01:31:10 +0000\0" + "Subject\0[PATCH V2 3/3] hwmon:f71882fg fix f81866a voltage protection\0" + "Date\0Tue, 30 Jun 2015 09:31:10 +0800\0" "To\0jdelvare@suse.de" " linux@roeck-us.net\0" "Cc\0lm-sensors@lm-sensors.org" @@ -41,17 +41,23 @@ " \tif (time_after(jiffies, data->last_limits + 60 * HZ) ||\n" " \t\t\t!data->valid) {\n" " \t\tif (f71882fg_has_in1_alarm[data->type]) {\n" - "-\t\t\tdata->in1_max -\t\t\t\tf71882fg_read8(data, F71882FG_REG_IN1_HIGH);\n" - "-\t\t\tdata->in_beep -\t\t\t\tf71882fg_read8(data, F71882FG_REG_IN_BEEP);\n" - "+\t\t\tif (data->type = f81866a) {\n" - "+\t\t\t\tdata->in1_max +\t\t\t\t\tf71882fg_read8(data,\n" + "-\t\t\tdata->in1_max =\n" + "-\t\t\t\tf71882fg_read8(data, F71882FG_REG_IN1_HIGH);\n" + "-\t\t\tdata->in_beep =\n" + "-\t\t\t\tf71882fg_read8(data, F71882FG_REG_IN_BEEP);\n" + "+\t\t\tif (data->type == f81866a) {\n" + "+\t\t\t\tdata->in1_max =\n" + "+\t\t\t\t\tf71882fg_read8(data,\n" "+\t\t\t\t\t\t\tF81866_REG_IN1_HIGH);\n" - "+\t\t\t\tdata->in_beep +\t\t\t\t\tf71882fg_read8(data,\n" + "+\t\t\t\tdata->in_beep =\n" + "+\t\t\t\t\tf71882fg_read8(data,\n" "+\t\t\t\t\t\t\tF81866_REG_IN_BEEP);\n" "+\t\t\t} else {\n" - "+\t\t\t\tdata->in1_max +\t\t\t\t\tf71882fg_read8(data,\n" + "+\t\t\t\tdata->in1_max =\n" + "+\t\t\t\t\tf71882fg_read8(data,\n" "+\t\t\t\t\t\t\tF71882FG_REG_IN1_HIGH);\n" - "+\t\t\t\tdata->in_beep +\t\t\t\t\tf71882fg_read8(data,\n" + "+\t\t\t\tdata->in_beep =\n" + "+\t\t\t\t\tf71882fg_read8(data,\n" "+\t\t\t\t\t\t\tF71882FG_REG_IN_BEEP);\n" "+\t\t\t}\n" " \t\t}\n" @@ -64,7 +70,7 @@ "-\t\tif (f71882fg_has_in1_alarm[data->type])\n" "-\t\t\tdata->in_status = f71882fg_read8(data,\n" "+\t\tif (f71882fg_has_in1_alarm[data->type]) {\n" - "+\t\t\tif (data->type = f81866a)\n" + "+\t\t\tif (data->type == f81866a)\n" "+\t\t\t\tdata->in_status = f71882fg_read8(data,\n" "+\t\t\t\t\t\tF81866_REG_IN_STATUS);\n" "+\n" @@ -81,7 +87,7 @@ " \n" " \tmutex_lock(&data->update_lock);\n" "-\tf71882fg_write8(data, F71882FG_REG_IN1_HIGH, val);\n" - "+\tif (data->type = f81866a)\n" + "+\tif (data->type == f81866a)\n" "+\t\tf71882fg_write8(data, F81866_REG_IN1_HIGH, val);\n" "+\telse\n" "+\t\tf71882fg_write8(data, F71882FG_REG_IN1_HIGH, val);\n" @@ -93,7 +99,7 @@ " \n" " \tmutex_lock(&data->update_lock);\n" "-\tdata->in_beep = f71882fg_read8(data, F71882FG_REG_IN_BEEP);\n" - "+\tif (data->type = f81866a)\n" + "+\tif (data->type == f81866a)\n" "+\t\tdata->in_beep = f71882fg_read8(data, F81866_REG_IN_BEEP);\n" "+\telse\n" "+\t\tdata->in_beep = f71882fg_read8(data, F71882FG_REG_IN_BEEP);\n" @@ -104,7 +110,7 @@ " \t\tdata->in_beep &= ~(1 << nr);\n" " \n" "-\tf71882fg_write8(data, F71882FG_REG_IN_BEEP, data->in_beep);\n" - "+\tif (data->type = f81866a)\n" + "+\tif (data->type == f81866a)\n" "+\t\tf71882fg_write8(data, F81866_REG_IN_BEEP, data->in_beep);\n" "+\telse\n" "+\t\tf71882fg_write8(data, F71882FG_REG_IN_BEEP, data->in_beep);\n" @@ -112,12 +118,6 @@ " \n" " \treturn count;\n" "-- \n" - "1.9.1\n" - "\n" - "\n" - "_______________________________________________\n" - "lm-sensors mailing list\n" - "lm-sensors@lm-sensors.org\n" - http://lists.lm-sensors.org/mailman/listinfo/lm-sensors + 1.9.1 -685855d71f79b89374f6001785ec588144020e5898482e7996d612e91d2e9f25 +83f977c193490013030cccd118a65cb59a4f495f739fc07f93af2a93d4e6d6f6
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.