diff options
author | Heiner Kallweit <hkallweit1@gmail.com> | 2017-02-01 08:05:22 +0100 |
---|---|---|
committer | Philipp Zabel <p.zabel@pengutronix.de> | 2017-02-01 16:04:25 +0100 |
commit | 4891486fb2c80eaf3bb0f9eb065d15ecd357702f (patch) | |
tree | d9941a0080b78bea105eb0a3b65a8b43ea7e27f2 /drivers/reset | |
parent | bb475230b8e59a547ab66ac3b02572df21a580e9 (diff) | |
download | talos-obmc-linux-4891486fb2c80eaf3bb0f9eb065d15ecd357702f.tar.gz talos-obmc-linux-4891486fb2c80eaf3bb0f9eb065d15ecd357702f.zip |
reset: core: fix reset_control_put
Commit "reset: make optional functions really optional" missed to
adjust one check in reset_control_put, causing a NULL pointer
access for optional resets.
Fixes: bb475230b8e5 "reset: make optional functions really optional"
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Diffstat (limited to 'drivers/reset')
-rw-r--r-- | drivers/reset/core.c | 2 |
1 files changed, 1 insertions, 1 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); |