From 2e1a0b920fc3ba984b8261b7f9ba99bde69f5486 Mon Sep 17 00:00:00 2001
From: Cyrill Gorcunov <gorcunov@gmail.com>
Date: Sat, 5 Jul 2008 15:53:37 +0400
Subject: [PATCH] --- yaml --- r: 104338 b: refs/heads/master c:
 d6cd7effcc5e0047faf15ab0a54c980f1a616a07 h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/arch/x86/kernel/io_delay.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 73d51700667c..997db00035b7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ab6bc3e343fbe3be4a0f67225e849d0db6b4b7ac
+refs/heads/master: d6cd7effcc5e0047faf15ab0a54c980f1a616a07
diff --git a/trunk/arch/x86/kernel/io_delay.c b/trunk/arch/x86/kernel/io_delay.c
index 5921e5f0a640..1c3a66a67f83 100644
--- a/trunk/arch/x86/kernel/io_delay.c
+++ b/trunk/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"))