| From 494346b5e984c80869eede6a3156c57c61bff9da Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Wed, 20 Nov 2019 15:59:26 +0100 |
| Subject: reset: Do not register resource data for missing resets |
| |
| From: Geert Uytterhoeven <geert+renesas@glider.be> |
| |
| [ Upstream commit db23808615e29d9a04f96806cac56f78b0fee0ef ] |
| |
| When an optional reset is not present, __devm_reset_control_get() and |
| devm_reset_control_array_get() still register resource data to release |
| the non-existing reset on cleanup, which is futile. |
| |
| Fix this by skipping NULL reset control pointers. |
| |
| Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> |
| Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/reset/core.c | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| diff --git a/drivers/reset/core.c b/drivers/reset/core.c |
| index 3c9a64c1b7a8..f343bd814d32 100644 |
| --- a/drivers/reset/core.c |
| +++ b/drivers/reset/core.c |
| @@ -787,7 +787,7 @@ struct reset_control *__devm_reset_control_get(struct device *dev, |
| return ERR_PTR(-ENOMEM); |
| |
| rstc = __reset_control_get(dev, id, index, shared, optional, acquired); |
| - if (!IS_ERR(rstc)) { |
| + if (!IS_ERR_OR_NULL(rstc)) { |
| *ptr = rstc; |
| devres_add(dev, ptr); |
| } else { |
| @@ -930,7 +930,7 @@ devm_reset_control_array_get(struct device *dev, bool shared, bool optional) |
| return ERR_PTR(-ENOMEM); |
| |
| rstc = of_reset_control_array_get(dev->of_node, shared, optional, true); |
| - if (IS_ERR(rstc)) { |
| + if (IS_ERR_OR_NULL(rstc)) { |
| devres_free(devres); |
| return rstc; |
| } |
| -- |
| 2.20.1 |
| |
