Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg...

[deliverable/linux.git] / drivers / video / fsl-diu-fb.c

diff --git a/drivers/video/fsl-diu-fb.c b/drivers/video/fsl-diu-fb.c
index 9cd36c223d334c05768b61c055ac8e1b16d81cb0..bd320a2bfb7c5ef92b5e803aa30bbb648979da4a 100644 (file)
--- a/drivers/video/fsl-diu-fb.c
+++ b/drivers/video/fsl-diu-fb.c
@@ -1649,8 +1649,10 @@ static int __init fsl_diu_init(void)
        }
 
        prop = of_get_property(np, "d-cache-size", NULL);
-       if (prop == NULL)
+       if (prop == NULL) {
+               of_node_put(np);
                return -ENODEV;
+       }
 
        /* Freescale PLRU requires 13/8 times the cache size to do a proper
           displacement flush
@@ -1659,8 +1661,10 @@ static int __init fsl_diu_init(void)
        coherence_data_size /= 8;
 
        prop = of_get_property(np, "d-cache-line-size", NULL);
-       if (prop == NULL)
+       if (prop == NULL) {
+               of_node_put(np);
                return -ENODEV;
+       }
        d_cache_line_size = *prop;
 
        of_node_put(np);