diff options
| author | Linus Torvalds | 2019-03-02 16:43:15 -0800 |
|---|---|---|
| committer | Linus Torvalds | 2019-03-02 16:43:15 -0800 |
| commit | c027c7cf1577bc2333449447c6e48c93126a56b0 (patch) | |
| tree | 3172fb3c21cabf646fed483e4159481aaced3e32 /drivers | |
| parent | e7c42a89e9f16039684418dfe3c43b068734ff8f (diff) | |
| parent | 6089e65618dca3fc0e7ccd7a6315de62ebf893a4 (diff) | |
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
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/tee/optee/core.c | 4 |
1 files changed, 3 insertions, 1 deletions
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) return -ENODEV; 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; + } optee = optee_probe(np); of_node_put(np); |