diff options
| author | Ingo Molnar <mingo@kernel.org> | 2019-04-10 09:14:42 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2019-04-10 09:14:42 +0200 |
| commit | 54bbfe75cbb10384b0a62efae80fde21deea1dd0 (patch) | |
| tree | eed22c29cdecce36153bbb83ee7a9da7eed60ccd /arch/arm/mach-omap2/display.c | |
| parent | ddb20d1d3aed8f130519c0a29cd5392efcc067b8 (diff) | |
| parent | 771acc7e4a6e5dba779cb1a7fd851a164bc81033 (diff) | |
| download | linux-54bbfe75cbb10384b0a62efae80fde21deea1dd0.tar.gz linux-54bbfe75cbb10384b0a62efae80fde21deea1dd0.tar.bz2 linux-54bbfe75cbb10384b0a62efae80fde21deea1dd0.zip | |
Merge branch 'linus' into locking/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/arm/mach-omap2/display.c')
| -rw-r--r-- | arch/arm/mach-omap2/display.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/display.c b/arch/arm/mach-omap2/display.c index 1444b4b4bd9f..439e143cad7b 100644 --- a/arch/arm/mach-omap2/display.c +++ b/arch/arm/mach-omap2/display.c @@ -250,8 +250,10 @@ static int __init omapdss_init_of(void) if (!node) return 0; - if (!of_device_is_available(node)) + if (!of_device_is_available(node)) { + of_node_put(node); return 0; + } pdev = of_find_device_by_node(node); |