diff for duplicates of <4F65CF2C.4000205@redhat.com> diff --git a/a/1.txt b/N1/1.txt index 89eef43..3b44214 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -283,8 +283,7 @@ Hans >> + all references to our watchdog device are released */ >> +static void sch56xx_watchdog_release_resources(struct kref *r) >> +{ ->> + struct sch56xx_watchdog_data *data = ->> + container_of(r, struct sch56xx_watchdog_data, kref); +>> + struct sch56xx_watchdog_data *data >> + container_of(r, struct sch56xx_watchdog_data, kref); >> + kfree(data); >> +} >> + @@ -309,7 +308,7 @@ Hans >> + goto leave; >> + } >> + ->> + if (resolution == 1) +>> + if (resolution = 1) >> + control = data->watchdog_control | SCH56XX_WDOG_TIME_BASE_SEC; >> + else >> + control = data->watchdog_control& ~SCH56XX_WDOG_TIME_BASE_SEC; @@ -502,7 +501,7 @@ Hans >> + if (!mutex_trylock(&watchdog_data_mutex)) >> + return -ERESTARTSYS; >> + list_for_each_entry(pos,&watchdog_data_list, list) { ->> + if (pos->watchdog_miscdev.minor == iminor(inode)) { +>> + if (pos->watchdog_miscdev.minor = iminor(inode)) { >> + data = pos; >> + break; >> + } @@ -545,7 +544,7 @@ Hans >> + char c; >> + if (get_user(c, buf + i)) >> + return -EFAULT; ->> + if (c == 'V') +>> + if (c = 'V') >> + data->watchdog_expect_close = 1; >> + } >> + } @@ -636,10 +635,8 @@ Hans >> + >> + /* Cache the watchdog registers */ >> + mutex_lock(io_lock); ->> + control = ->> + sch56xx_read_virtual_reg(addr, SCH56XX_REG_WDOG_CONTROL); ->> + output_enable = ->> + sch56xx_read_virtual_reg(addr, SCH56XX_REG_WDOG_OUTPUT_ENABLE); +>> + control >> + sch56xx_read_virtual_reg(addr, SCH56XX_REG_WDOG_CONTROL); +>> + output_enable >> + sch56xx_read_virtual_reg(addr, SCH56XX_REG_WDOG_OUTPUT_ENABLE); >> + mutex_unlock(io_lock); >> + >> + if (control< 0) @@ -675,12 +672,12 @@ Hans >> + for (i = 0; i< ARRAY_SIZE(watchdog_minors); i++) { >> + /* Register our watchdog part */ >> + snprintf(data->watchdog_name, sizeof(data->watchdog_name), ->> + "watchdog%c", (i == 0) ? '\0' : ('0' + i)); +>> + "watchdog%c", (i = 0) ? '\0' : ('0' + i)); >> + data->watchdog_miscdev.name = data->watchdog_name; >> + data->watchdog_miscdev.fops =&watchdog_fops; >> + data->watchdog_miscdev.minor = watchdog_minors[i]; >> + err = misc_register(&data->watchdog_miscdev); ->> + if (err == -EBUSY) +>> + if (err = -EBUSY) >> + continue; >> + if (err) >> + break; @@ -696,7 +693,7 @@ Hans >> + pr_err("Registering watchdog chardev: %d\n", err); >> + goto error; >> + } ->> + if (i == ARRAY_SIZE(watchdog_minors)) { +>> + if (i = ARRAY_SIZE(watchdog_minors)) { >> + pr_warn("Couldn't register watchdog (no free minor)\n"); >> + goto error; >> + } @@ -776,3 +773,8 @@ Hans >> lm-sensors mailing list >> lm-sensors@lm-sensors.org >> http://lists.lm-sensors.org/mailman/listinfo/lm-sensors + +_______________________________________________ +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 11a4147..371a16f 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -3,7 +3,7 @@ "ref\020120317185850.GA23351@ericsson.com\0" "From\0Hans de Goede <hdegoede@redhat.com>\0" "Subject\0Re: [lm-sensors] [PATCH] hwmon/sch56xx: Add support for the integrated watchdog\0" - "Date\0Sun, 18 Mar 2012 13:03:56 +0100\0" + "Date\0Sun, 18 Mar 2012 12:03:56 +0000\0" "To\0Guenter Roeck <guenter.roeck@ericsson.com>\0" "Cc\0LM Sensors <lm-sensors@lm-sensors.org>" Thilo Cestonaro <thilo.cestonaro@ts.fujitsu.com> @@ -295,8 +295,7 @@ ">> + all references to our watchdog device are released */\n" ">> +static void sch56xx_watchdog_release_resources(struct kref *r)\n" ">> +{\n" - ">> + struct sch56xx_watchdog_data *data =\n" - ">> + container_of(r, struct sch56xx_watchdog_data, kref);\n" + ">> + struct sch56xx_watchdog_data *data >> + container_of(r, struct sch56xx_watchdog_data, kref);\n" ">> + kfree(data);\n" ">> +}\n" ">> +\n" @@ -321,7 +320,7 @@ ">> + goto leave;\n" ">> + }\n" ">> +\n" - ">> + if (resolution == 1)\n" + ">> + if (resolution = 1)\n" ">> + control = data->watchdog_control | SCH56XX_WDOG_TIME_BASE_SEC;\n" ">> + else\n" ">> + control = data->watchdog_control& ~SCH56XX_WDOG_TIME_BASE_SEC;\n" @@ -514,7 +513,7 @@ ">> + if (!mutex_trylock(&watchdog_data_mutex))\n" ">> + return -ERESTARTSYS;\n" ">> + list_for_each_entry(pos,&watchdog_data_list, list) {\n" - ">> + if (pos->watchdog_miscdev.minor == iminor(inode)) {\n" + ">> + if (pos->watchdog_miscdev.minor = iminor(inode)) {\n" ">> + data = pos;\n" ">> + break;\n" ">> + }\n" @@ -557,7 +556,7 @@ ">> + char c;\n" ">> + if (get_user(c, buf + i))\n" ">> + return -EFAULT;\n" - ">> + if (c == 'V')\n" + ">> + if (c = 'V')\n" ">> + data->watchdog_expect_close = 1;\n" ">> + }\n" ">> + }\n" @@ -648,10 +647,8 @@ ">> +\n" ">> + /* Cache the watchdog registers */\n" ">> + mutex_lock(io_lock);\n" - ">> + control =\n" - ">> + sch56xx_read_virtual_reg(addr, SCH56XX_REG_WDOG_CONTROL);\n" - ">> + output_enable =\n" - ">> + sch56xx_read_virtual_reg(addr, SCH56XX_REG_WDOG_OUTPUT_ENABLE);\n" + ">> + control >> + sch56xx_read_virtual_reg(addr, SCH56XX_REG_WDOG_CONTROL);\n" + ">> + output_enable >> + sch56xx_read_virtual_reg(addr, SCH56XX_REG_WDOG_OUTPUT_ENABLE);\n" ">> + mutex_unlock(io_lock);\n" ">> +\n" ">> + if (control< 0)\n" @@ -687,12 +684,12 @@ ">> + for (i = 0; i< ARRAY_SIZE(watchdog_minors); i++) {\n" ">> + /* Register our watchdog part */\n" ">> + snprintf(data->watchdog_name, sizeof(data->watchdog_name),\n" - ">> + \"watchdog%c\", (i == 0) ? '\\0' : ('0' + i));\n" + ">> + \"watchdog%c\", (i = 0) ? '\\0' : ('0' + i));\n" ">> + data->watchdog_miscdev.name = data->watchdog_name;\n" ">> + data->watchdog_miscdev.fops =&watchdog_fops;\n" ">> + data->watchdog_miscdev.minor = watchdog_minors[i];\n" ">> + err = misc_register(&data->watchdog_miscdev);\n" - ">> + if (err == -EBUSY)\n" + ">> + if (err = -EBUSY)\n" ">> + continue;\n" ">> + if (err)\n" ">> + break;\n" @@ -708,7 +705,7 @@ ">> + pr_err(\"Registering watchdog chardev: %d\\n\", err);\n" ">> + goto error;\n" ">> + }\n" - ">> + if (i == ARRAY_SIZE(watchdog_minors)) {\n" + ">> + if (i = ARRAY_SIZE(watchdog_minors)) {\n" ">> + pr_warn(\"Couldn't register watchdog (no free minor)\\n\");\n" ">> + goto error;\n" ">> + }\n" @@ -787,6 +784,11 @@ ">> _______________________________________________\n" ">> lm-sensors mailing list\n" ">> lm-sensors@lm-sensors.org\n" - >> http://lists.lm-sensors.org/mailman/listinfo/lm-sensors + ">> http://lists.lm-sensors.org/mailman/listinfo/lm-sensors\n" + "\n" + "_______________________________________________\n" + "lm-sensors mailing list\n" + "lm-sensors@lm-sensors.org\n" + http://lists.lm-sensors.org/mailman/listinfo/lm-sensors -fafb703a76eeb0fcc276977cc23d9ed3f20ba9795e30a28423d346b8f26700cb +1c34bee60afb36bfafdd9b6c089194b94efa130fdad4aa1660b7687d7064433e
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.