diff options
| author | Christian Eggers <ceggers@arri.de> | 2020-01-21 12:02:41 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2020-01-22 09:22:35 +0100 |
| commit | 960352f2dab113b92e88958722e80477abc49191 (patch) | |
| tree | 86a10b7eccd991e0a404548e0d9d442d63b3926b /drivers | |
| parent | 4c9ab9a7e82de74c9371ab46abe649072d08bbf5 (diff) | |
| download | barebox-960352f2dab113b92e88958722e80477abc49191.tar.gz barebox-960352f2dab113b92e88958722e80477abc49191.tar.xz | |
watchdog: Fix error path
In case of an error (e.g. dev_add_param_tristate_ro() returns -ENOSYS),
device registration must be reverted.
Signed-off-by: Christian Eggers <ceggers@arri.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/watchdog/wd_core.c | 30 |
1 files changed, 21 insertions, 9 deletions
diff --git a/drivers/watchdog/wd_core.c b/drivers/watchdog/wd_core.c index b6e2a37b1f..34040408f7 100644 --- a/drivers/watchdog/wd_core.c +++ b/drivers/watchdog/wd_core.c @@ -171,8 +171,10 @@ int watchdog_register(struct watchdog *wd) return ret; p = dev_add_param_tristate_ro(&wd->dev, "running", &wd->running); - if (IS_ERR(p)) - return PTR_ERR(p); + if (IS_ERR(p)) { + ret = PTR_ERR(p); + goto error_unregister; + } if (!wd->priority) wd->priority = dev_get_watchdog_priority(wd->hwdev); @@ -180,8 +182,10 @@ int watchdog_register(struct watchdog *wd) p = dev_add_param_uint32(&wd->dev, "priority", watchdog_set_priority, NULL, &wd->priority, "%u", wd); - if (IS_ERR(p)) - return PTR_ERR(p); + if (IS_ERR(p)) { + ret = PTR_ERR(p); + goto error_unregister; + } /* set some default sane value */ if (!wd->timeout_max) @@ -189,8 +193,10 @@ int watchdog_register(struct watchdog *wd) p = dev_add_param_uint32_ro(&wd->dev, "timeout_max", &wd->timeout_max, "%u"); - if (IS_ERR(p)) - return PTR_ERR(p); + if (IS_ERR(p)) { + ret = PTR_ERR(p); + goto error_unregister; + } if (IS_ENABLED(CONFIG_WATCHDOG_POLLER)) { if (!wd->poller_timeout_cur || @@ -199,12 +205,14 @@ int watchdog_register(struct watchdog *wd) p = dev_add_param_uint32(&wd->dev, "timeout_cur", watchdog_set_cur, NULL, &wd->poller_timeout_cur, "%u", wd); - if (IS_ERR(p)) - return PTR_ERR(p); + if (IS_ERR(p)) { + ret = PTR_ERR(p); + goto error_unregister; + } ret = watchdog_register_poller(wd); if (ret) - return ret; + goto error_unregister; } list_add_tail(&wd->list, &watchdog_list); @@ -213,6 +221,10 @@ int watchdog_register(struct watchdog *wd) wd->priority); return 0; + +error_unregister: + unregister_device(&wd->dev); + return ret; } EXPORT_SYMBOL(watchdog_register); |