X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=init%2Fmain.c;h=321d0ceb26d3782ed6871feef4c52090e9872b23;hb=9d1f9c73dfcccca7de4a9fdaec40c60c4e5497a4;hp=800a0daede7e4d8b8940288bd30dfb43a6e922a8;hpb=3d430bdb74140224d90dd6253d67ff71d181cf64;p=firefly-linux-kernel-4.4.55.git

diff --git a/init/main.c b/init/main.c
index 800a0daede7e..321d0ceb26d3 100644
--- a/init/main.c
+++ b/init/main.c
@@ -544,7 +544,7 @@ asmlinkage __visible void __init start_kernel(void)
 				  static_command_line, __start___param,
 				  __stop___param - __start___param,
 				  -1, -1, &unknown_bootoption);
-	if (after_dashes)
+	if (!IS_ERR_OR_NULL(after_dashes))
 		parse_args("Setting init args", after_dashes, NULL, 0, -1, -1,
 			   set_init_arg);