diff for duplicates of <20120317185850.GA23351@ericsson.com> diff --git a/a/1.txt b/N1/1.txt index d28bb76..70fd2ec 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -260,8 +260,7 @@ Guenter > + 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); > +} > + @@ -286,7 +285,7 @@ Guenter > + 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; @@ -479,7 +478,7 @@ Guenter > + 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; > + } @@ -522,7 +521,7 @@ Guenter > + char c; > + if (get_user(c, buf + i)) > + return -EFAULT; -> + if (c == 'V') +> + if (c = 'V') > + data->watchdog_expect_close = 1; > + } > + } @@ -613,10 +612,8 @@ Guenter > + > + /* 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) @@ -652,12 +649,12 @@ Guenter > + 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; @@ -673,7 +670,7 @@ Guenter > + 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; > + } @@ -753,3 +750,8 @@ Guenter > 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 7ec0e55..b116c84 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,7 +2,7 @@ "ref\01331977229-1370-2-git-send-email-hdegoede@redhat.com\0" "From\0Guenter Roeck <guenter.roeck@ericsson.com>\0" "Subject\0Re: [lm-sensors] [PATCH] hwmon/sch56xx: Add support for the integrated watchdog\0" - "Date\0Sat, 17 Mar 2012 11:58:50 -0700\0" + "Date\0Sat, 17 Mar 2012 18:58:50 +0000\0" "To\0Hans de Goede <hdegoede@redhat.com>\0" "Cc\0LM Sensors <lm-sensors@lm-sensors.org>" Thilo Cestonaro <thilo.cestonaro@ts.fujitsu.com> @@ -271,8 +271,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" @@ -297,7 +296,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" @@ -490,7 +489,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" @@ -533,7 +532,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" @@ -624,10 +623,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" @@ -663,12 +660,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" @@ -684,7 +681,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" @@ -763,6 +760,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 -614b0802bb1cbcbf51ab689d117dd3a4fb6263183837bec0184eaa8acbfdbee8 +2340c56c3d2f3fa39bd28e81533f516cacae223cc65ac64975b4d6f12fccf366
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.