powerpc/83xx: apply mpc8360e quirk for kmeter1 only when par_io is present
authorGerlando Falauto <gerlando.falauto@keymile.com>
Fri, 7 Dec 2012 15:09:15 +0000 (16:09 +0100)
committerKumar Gala <galak@kernel.crashing.org>
Wed, 13 Feb 2013 13:49:07 +0000 (07:49 -0600)
There is no point in applying this quirk when par_io is not present.

Signed-off-by: Gerlando Falauto <gerlando.falauto@keymile.com>
Signed-off-by: Holger Brunck <holger.brunck@keymile.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
arch/powerpc/platforms/83xx/km83xx.c

index 88b1af0..bf4c447 100644 (file)
@@ -148,11 +148,13 @@ static void __init mpc83xx_km_setup_arch(void)
 
                for_each_node_by_name(np, "ucc")
                        par_io_of_config(np);
-       }
-       np = of_find_compatible_node(NULL, "network", "ucc_geth");
-       if (np != NULL) {
-               quirk_mpc8360e_qe_enet10();
-               of_node_put(np);
+
+               /* Only apply this quirk when par_io is available */
+               np = of_find_compatible_node(NULL, "network", "ucc_geth");
+               if (np != NULL) {
+                       quirk_mpc8360e_qe_enet10();
+                       of_node_put(np);
+               }
        }
 #endif /* CONFIG_QUICC_ENGINE */
 }