aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-07-28 18:32:11 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2016-07-28 18:32:11 -0400
commitc9b011a87dd49bac1632311811c974bb7cd33c25 (patch)
tree1173cc1d4942339e363910d59522c03e4efd4f00
parentce8c891c3496d3ea4a72ec40beac9a7b7f6649bf (diff)
parent2dbd85859fca74d3d3a9f05f399c53a89f7ed2bd (diff)
Merge tag 'hwlock-v4.8' of git://github.com/andersson/remoteproc
Pull hwspinlock updates from Bjorn Andersson: "Add missing of_node_put() in the Qualcomm driver and update MAINTAINERS to make sure all hwspinlock related files have a maintainer listed" * tag 'hwlock-v4.8' of git://github.com/andersson/remoteproc: MAINTAINERS: Update hwspinlock paths hwspinlock: qcom_hwspinlock: add missing of_node_put after calling of_parse_phandle
-rw-r--r--MAINTAINERS3
-rw-r--r--drivers/hwspinlock/qcom_hwspinlock.c1
2 files changed, 3 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 13a782b4f695..febb29c4d0ca 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5334,8 +5334,9 @@ M: Bjorn Andersson <bjorn.andersson@linaro.org>
5334L: linux-remoteproc@vger.kernel.org 5334L: linux-remoteproc@vger.kernel.org
5335S: Maintained 5335S: Maintained
5336T: git git://git.kernel.org/pub/scm/linux/kernel/git/ohad/hwspinlock.git 5336T: git git://git.kernel.org/pub/scm/linux/kernel/git/ohad/hwspinlock.git
5337F: Documentation/devicetree/bindings/hwlock/
5337F: Documentation/hwspinlock.txt 5338F: Documentation/hwspinlock.txt
5338F: drivers/hwspinlock/hwspinlock_* 5339F: drivers/hwspinlock/
5339F: include/linux/hwspinlock.h 5340F: include/linux/hwspinlock.h
5340 5341
5341HARMONY SOUND DRIVER 5342HARMONY SOUND DRIVER
diff --git a/drivers/hwspinlock/qcom_hwspinlock.c b/drivers/hwspinlock/qcom_hwspinlock.c
index c752447fbac7..fa6880b8060a 100644
--- a/drivers/hwspinlock/qcom_hwspinlock.c
+++ b/drivers/hwspinlock/qcom_hwspinlock.c
@@ -98,6 +98,7 @@ static int qcom_hwspinlock_probe(struct platform_device *pdev)
98 } 98 }
99 99
100 regmap = syscon_node_to_regmap(syscon); 100 regmap = syscon_node_to_regmap(syscon);
101 of_node_put(syscon);
101 if (IS_ERR(regmap)) 102 if (IS_ERR(regmap))
102 return PTR_ERR(regmap); 103 return PTR_ERR(regmap);
103 104