aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/arm/boot/dts/gemini-dlink-dir-685.dts2
-rw-r--r--arch/arm64/boot/dts/qcom/msm8998.dtsi2
-rw-r--r--drivers/tee/optee/core.c4
3 files changed, 5 insertions, 3 deletions
diff --git a/arch/arm/boot/dts/gemini-dlink-dir-685.dts b/arch/arm/boot/dts/gemini-dlink-dir-685.dts
index cc0c3cf89eaa..592111c8d6fd 100644
--- a/arch/arm/boot/dts/gemini-dlink-dir-685.dts
+++ b/arch/arm/boot/dts/gemini-dlink-dir-685.dts
@@ -443,7 +443,7 @@
443 }; 443 };
444 444
445 display-controller@6a000000 { 445 display-controller@6a000000 {
446 status = "disabled"; 446 status = "okay";
447 447
448 port@0 { 448 port@0 {
449 reg = <0>; 449 reg = <0>;
diff --git a/arch/arm64/boot/dts/qcom/msm8998.dtsi b/arch/arm64/boot/dts/qcom/msm8998.dtsi
index 8d41b69ec2da..99bccaac31ad 100644
--- a/arch/arm64/boot/dts/qcom/msm8998.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8998.dtsi
@@ -37,7 +37,7 @@
37 }; 37 };
38 38
39 memory@86200000 { 39 memory@86200000 {
40 reg = <0x0 0x86200000 0x0 0x2600000>; 40 reg = <0x0 0x86200000 0x0 0x2d00000>;
41 no-map; 41 no-map;
42 }; 42 };
43 43
diff --git a/drivers/tee/optee/core.c b/drivers/tee/optee/core.c
index e5efce3c08e2..947f9b28de9e 100644
--- a/drivers/tee/optee/core.c
+++ b/drivers/tee/optee/core.c
@@ -699,8 +699,10 @@ static int __init optee_driver_init(void)
699 return -ENODEV; 699 return -ENODEV;
700 700
701 np = of_find_matching_node(fw_np, optee_match); 701 np = of_find_matching_node(fw_np, optee_match);
702 if (!np || !of_device_is_available(np)) 702 if (!np || !of_device_is_available(np)) {
703 of_node_put(np);
703 return -ENODEV; 704 return -ENODEV;
705 }
704 706
705 optee = optee_probe(np); 707 optee = optee_probe(np);
706 of_node_put(np); 708 of_node_put(np);