Merge branch 'topic/enum-info-cleanup' into for-next

[firefly-linux-kernel-4.4.55.git] / drivers / video / of_display_timing.c

diff --git a/drivers/video/of_display_timing.c b/drivers/video/of_display_timing.c
index 5c098d5b40432ef2cec004ce420ef9660ef81599..32d8275e4c88485b2b522f56733e90ba614fc7b2 100644 (file)
--- a/drivers/video/of_display_timing.c
+++ b/drivers/video/of_display_timing.c
@@ -233,8 +233,7 @@ struct display_timings *of_get_display_timings(struct device_node *np)
        return disp;
 
 timingfail:
-       if (native_mode)
-               of_node_put(native_mode);
+       of_node_put(native_mode);
        display_timings_release(disp);
        disp = NULL;
 entryfail: