diff options
| author | Cyrill Gorcunov <gorcunov@gmail.com> | 2008-07-31 20:49:29 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-08-06 09:03:12 -0700 |
| commit | 97a9945a6459ff63dc904d412e6c137b68d0d7d0 (patch) | |
| tree | c24d7026ebd8cdfb8f9709aadf639fb2a2d3f9c6 /arch | |
| parent | 7cdece1700d9ac159742ee6e4e89a52389818297 (diff) | |
x86: io delay - add checking for NULL early param
[ Upstream commit d6cd7effcc5e0047faf15ab0a54c980f1a616a07 ]
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>
CC: Oliver Pinter <oliver.pntr@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/kernel/io_delay.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/x86/kernel/io_delay.c b/arch/x86/kernel/io_delay.c index 5921e5f0a640..1c3a66a67f83 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")) |