Merge branch 'for-linus' of git://git.samba.org/sfrench/cifs-2.6

[linux.git] / kernel / kexec.c

diff --git a/kernel/kexec.c b/kernel/kexec.c
index 59f7b55ba7453d4b406d0c066e5f6be5cea7037c..2a74f307c5ec57b050ceeb8a21341f8a394841ef 100644 (file)
--- a/kernel/kexec.c
+++ b/kernel/kexec.c
@@ -1474,11 +1474,8 @@ static int __init __parse_crashkernel(char *cmdline,
        if (first_colon && (!first_space || first_colon < first_space))
                return parse_crashkernel_mem(ck_cmdline, system_ram,
                                crash_size, crash_base);
-       else
-               return parse_crashkernel_simple(ck_cmdline, crash_size,
-                               crash_base);
 
-       return 0;
+       return parse_crashkernel_simple(ck_cmdline, crash_size, crash_base);
 }
 
 /*