diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2017-02-07 17:18:29 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2017-02-07 17:18:29 +0100 |
| commit | 57ac490466a5f9f703a9183a8583df1d9660ce0c (patch) | |
| tree | 9e6a856e691c8d7d3801bd0cd96668042cdad8a0 | |
| parent | 1096ffd75aa50fc27d74a30b336ef2efe0b6cbbf (diff) | |
| parent | 7a1ca76dba35d1a443278811fb67625f0e98a713 (diff) | |
Merge tag 'reset-for-4.11-2' of git://git.pengutronix.de/pza/linux into next/drivers
Pull "Reset controller changes for v4.11, part 2" from Philipp Zabel:
- Fix missing NULL check in reset_control_put for optional reset control
conversion
- Make zx2967 driver explicitly non-modular
* tag 'reset-for-4.11-2' of git://git.pengutronix.de/pza/linux:
reset: make zx2967 explicitly non-modular
reset: core: fix reset_control_put
| -rw-r--r-- | drivers/reset/core.c | 2 | ||||
| -rw-r--r-- | drivers/reset/reset-zx2967.c | 7 |
2 files changed, 1 insertions, 8 deletions
diff --git a/drivers/reset/core.c b/drivers/reset/core.c index c79cce3a7b6d..71ccf281dce3 100644 --- a/drivers/reset/core.c +++ b/drivers/reset/core.c @@ -392,7 +392,7 @@ EXPORT_SYMBOL_GPL(__of_reset_control_get); void reset_control_put(struct reset_control *rstc) { - if (IS_ERR(rstc)) + if (IS_ERR_OR_NULL(rstc)) return; mutex_lock(&reset_list_mutex); diff --git a/drivers/reset/reset-zx2967.c b/drivers/reset/reset-zx2967.c index 5d821513aa3e..4dabb9ec4841 100644 --- a/drivers/reset/reset-zx2967.c +++ b/drivers/reset/reset-zx2967.c @@ -8,7 +8,6 @@ * License terms: GNU General Public License (GPL) version 2 */ -#include <linux/module.h> #include <linux/of_address.h> #include <linux/platform_device.h> #include <linux/reset-controller.h> @@ -89,7 +88,6 @@ static const struct of_device_id zx2967_reset_dt_ids[] = { { .compatible = "zte,zx296718-reset", }, {}, }; -MODULE_DEVICE_TABLE(of, zx2967_reset_dt_ids); static struct platform_driver zx2967_reset_driver = { .probe = zx2967_reset_probe, @@ -98,9 +96,4 @@ static struct platform_driver zx2967_reset_driver = { .of_match_table = zx2967_reset_dt_ids, }, }; - builtin_platform_driver(zx2967_reset_driver); - -MODULE_AUTHOR("Baoyou Xie <baoyou.xie@linaro.org>"); -MODULE_DESCRIPTION("ZTE zx2967 Reset Controller Driver"); -MODULE_LICENSE("GPL"); |