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
thoughtpolice · Jul 28, 2016 · c9b011a · c9b011a
2 parents ce8c891 + 2dbd858
commit c9b011a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/MAINTAINERS b/MAINTAINERS
@@ -5334,8 +5334,9 @@ M:	Bjorn Andersson <[email protected]>
 L:	[email protected]
 S:	Maintained
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/ohad/hwspinlock.git
+F:	Documentation/devicetree/bindings/hwlock/
 F:	Documentation/hwspinlock.txt
-F:	drivers/hwspinlock/hwspinlock_*
+F:	drivers/hwspinlock/
 F:	include/linux/hwspinlock.h
 
 HARMONY SOUND DRIVER

diff --git 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)
 	}
 
 	regmap = syscon_node_to_regmap(syscon);
+	of_node_put(syscon);
 	if (IS_ERR(regmap))
 		return PTR_ERR(regmap);