Commit c027c7cf authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

Pull ARM SoC fixes from Arnd Bergmann:
 "One more set of simple ARM platform fixes:

   - A boot regression on qualcomm msm8998

   - Gemini display controllers got turned off by accident

   - incorrect reference counting in optee"

* tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc:
  tee: optee: add missing of_node_put after of_device_is_available
  arm64: dts: qcom: msm8998: Extend TZ reserved memory area
  ARM: dts: gemini: Re-enable display controller
parents e7c42a89 6089e656
...@@ -443,7 +443,7 @@ ata@63000000 { ...@@ -443,7 +443,7 @@ ata@63000000 {
}; };
display-controller@6a000000 { display-controller@6a000000 {
status = "disabled"; status = "okay";
port@0 { port@0 {
reg = <0>; reg = <0>;
......
...@@ -37,7 +37,7 @@ smem_mem: smem-mem@86000000 { ...@@ -37,7 +37,7 @@ smem_mem: smem-mem@86000000 {
}; };
memory@86200000 { memory@86200000 {
reg = <0x0 0x86200000 0x0 0x2600000>; reg = <0x0 0x86200000 0x0 0x2d00000>;
no-map; no-map;
}; };
......
...@@ -699,8 +699,10 @@ static int __init optee_driver_init(void) ...@@ -699,8 +699,10 @@ static int __init optee_driver_init(void)
return -ENODEV; return -ENODEV;
np = of_find_matching_node(fw_np, optee_match); np = of_find_matching_node(fw_np, optee_match);
if (!np || !of_device_is_available(np)) if (!np || !of_device_is_available(np)) {
of_node_put(np);
return -ENODEV; return -ENODEV;
}
optee = optee_probe(np); optee = optee_probe(np);
of_node_put(np); of_node_put(np);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment