Эх сурвалжийг харах

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
Linus Torvalds 9 жил өмнө
parent
commit
c9b011a87d

+ 2 - 1
MAINTAINERS

@@ -5334,8 +5334,9 @@ M:	Bjorn Andersson <bjorn.andersson@linaro.org>
 L:	linux-remoteproc@vger.kernel.org
 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

+ 1 - 0
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);