From: Heiner Kallweit <hkallweit1@gmail.com>
Date: Wed, 1 Feb 2017 07:05:22 +0000 (+0100)
Subject: reset: core: fix reset_control_put
X-Git-Tag: v4.11-rc1~85^2~3^2~1
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=4891486fb2c80eaf3bb0f9eb065d15ecd357702f;p=linux-block.git

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>
---

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);