From: Cyrill Gorcunov <gorcunov@gmail.com>
Date: Sat, 5 Jul 2008 11:53:37 +0000 (+0400)
Subject: x86: io delay - add checking for NULL early param
X-Git-Tag: v2.6.27-rc1~955^2~1^4~17
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=d6cd7effcc5e0047faf15ab0a54c980f1a616a07;p=linux-2.6-omap-h63xx.git

x86: io delay - add checking for NULL early param

Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
Cc: akpm@linux-foundation.org
Cc: andi@firstfloor.org
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---

diff --git a/arch/x86/kernel/io_delay.c b/arch/x86/kernel/io_delay.c
index 5921e5f0a64..1c3a66a67f8 100644
--- a/arch/x86/kernel/io_delay.c
+++ b/arch/x86/kernel/io_delay.c
@@ -103,6 +103,9 @@ void __init io_delay_init(void)
 
 static int __init io_delay_param(char *s)
 {
+	if (!s)
+		return -EINVAL;
+
 	if (!strcmp(s, "0x80"))
 		io_delay_type = CONFIG_IO_DELAY_TYPE_0X80;
 	else if (!strcmp(s, "0xed"))