projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'v3.14.25' into backport/v3.14.24-ltsi-rc1+v3.14.25/snapshot-merge.wip
[platform/adaptation/renesas_rcar/renesas_kernel.git]
/
drivers
/
watchdog
/
pc87413_wdt.c
diff --git
a/drivers/watchdog/pc87413_wdt.c
b/drivers/watchdog/pc87413_wdt.c
index
5211d56
..
9f15dd9
100644
(file)
--- a/
drivers/watchdog/pc87413_wdt.c
+++ b/
drivers/watchdog/pc87413_wdt.c
@@
-512,9
+512,8
@@
static int __init pc87413_init(void)
return -EBUSY;
ret = register_reboot_notifier(&pc87413_notifier);
return -EBUSY;
ret = register_reboot_notifier(&pc87413_notifier);
- if (ret != 0)
{
+ if (ret != 0)
pr_err("cannot register reboot notifier (err=%d)\n", ret);
pr_err("cannot register reboot notifier (err=%d)\n", ret);
- }
ret = misc_register(&pc87413_miscdev);
if (ret != 0) {
ret = misc_register(&pc87413_miscdev);
if (ret != 0) {
@@
-575,8
+574,8
@@
static void __exit pc87413_exit(void)
module_init(pc87413_init);
module_exit(pc87413_exit);
module_init(pc87413_init);
module_exit(pc87413_exit);
-MODULE_AUTHOR("Sven Anders <anders@anduras.de>
, "
-
"Marcus Junker <junker@anduras.de>,
");
+MODULE_AUTHOR("Sven Anders <anders@anduras.de>
");
+
MODULE_AUTHOR("Marcus Junker <junker@anduras.de>
");
MODULE_DESCRIPTION("PC87413 WDT driver");
MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("PC87413 WDT driver");
MODULE_LICENSE("GPL");