2 files changed, 15 insertions, 9 deletions

diff --git a/arch/mips/alchemy/common/platform.c b/arch/mips/alchemy/common/platform.c
index 3b2c18b14341..f72c48d4804c 100644
--- a/arch/mips/alchemy/common/platform.c
+++ b/arch/mips/alchemy/common/platform.c
@@ -492,7 +492,7 @@ static void __init alchemy_setup_macs(int ctype)
                 memcpy(au1xxx_eth0_platform_data.mac, ethaddr, 6);
 
         ret = platform_device_register(&au1xxx_eth0_device);
-        if (!ret)
+        if (ret)
                 printk(KERN_INFO "Alchemy: failed to register MAC0\n");
 
 
diff --git a/arch/mips/alchemy/common/power.c b/arch/mips/alchemy/common/power.c
index 647e518c90bc..b86324a42601 100644
--- a/arch/mips/alchemy/common/power.c
+++ b/arch/mips/alchemy/common/power.c
@@ -158,15 +158,21 @@ static void restore_core_regs(void)
 
 void au_sleep(void)
 {
-        int cpuid = alchemy_get_cputype();
-        if (cpuid != ALCHEMY_CPU_UNKNOWN) {
-                save_core_regs();
-                if (cpuid <= ALCHEMY_CPU_AU1500)
-                        alchemy_sleep_au1000();
-                else if (cpuid <= ALCHEMY_CPU_AU1200)
-                        alchemy_sleep_au1550();
-                restore_core_regs();
+        save_core_regs();
+
+        switch (alchemy_get_cputype()) {
+        case ALCHEMY_CPU_AU1000:
+        case ALCHEMY_CPU_AU1500:
+        case ALCHEMY_CPU_AU1100:
+                alchemy_sleep_au1000();
+                break;
+        case ALCHEMY_CPU_AU1550:
+        case ALCHEMY_CPU_AU1200:
+                alchemy_sleep_au1550();
+                break;
         }
+
+        restore_core_regs();
 }
 
 #endif  /* CONFIG_PM */