git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...
[pandora-kernel.git]
/
drivers
/
acpi
/
tables.c
diff --git
a/drivers/acpi/tables.c
b/drivers/acpi/tables.c
index
c341918
..
775c97a
100644
(file)
--- a/
drivers/acpi/tables.c
+++ b/
drivers/acpi/tables.c
@@
-300,6
+300,8
@@
int __init acpi_table_init(void)
static int __init acpi_parse_apic_instance(char *str)
{
+ if (!str)
+ return -EINVAL;
acpi_apic_instance = simple_strtoul(str, NULL, 0);