projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for_rmk' of git://git.mnementh.co.uk/linux-2.6-im
[firefly-linux-kernel-4.4.55.git]
/
arch
/
x86
/
kernel
/
io_delay.c
diff --git
a/arch/x86/kernel/io_delay.c
b/arch/x86/kernel/io_delay.c
index 5921e5f0a64027745fa2ac3e5f695ceaca9ddeae..720d2607aacbc2bee985b00289b8bc5c70cb4fb5 100644
(file)
--- a/
arch/x86/kernel/io_delay.c
+++ b/
arch/x86/kernel/io_delay.c
@@
-92,6
+92,14
@@
static struct dmi_system_id __initdata io_delay_0xed_port_dmi_table[] = {
DMI_MATCH(DMI_BOARD_NAME, "30BF")
}
},
DMI_MATCH(DMI_BOARD_NAME, "30BF")
}
},
+ {
+ .callback = dmi_io_delay_0xed_port,
+ .ident = "Presario F700",
+ .matches = {
+ DMI_MATCH(DMI_BOARD_VENDOR, "Quanta"),
+ DMI_MATCH(DMI_BOARD_NAME, "30D3")
+ }
+ },
{ }
};
{ }
};
@@
-103,6
+111,9
@@
void __init io_delay_init(void)
static int __init io_delay_param(char *s)
{
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"))
if (!strcmp(s, "0x80"))
io_delay_type = CONFIG_IO_DELAY_TYPE_0X80;
else if (!strcmp(s, "0xed"))