summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCyrill Gorcunov <gorcunov@gmail.com>2008-07-05 15:53:37 +0400
committerIngo Molnar <mingo@elte.hu>2008-07-09 13:57:54 +0200
commitd6cd7effcc5e0047faf15ab0a54c980f1a616a07 (patch)
treeba6227c1a8af3a84c5fc18c48306fa3b03a6bf18
parentab6bc3e343fbe3be4a0f67225e849d0db6b4b7ac (diff)
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>
-rw-r--r--arch/x86/kernel/io_delay.c3
1 files changed, 3 insertions, 0 deletions
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"))