projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
acpi: Make ACPI_TOSHIBA depend on INPUT.
[cascardo/linux.git]
/
drivers
/
acpi
/
utils.c
diff --git
a/drivers/acpi/utils.c
b/drivers/acpi/utils.c
index
eba55b7
..
1009261
100644
(file)
--- a/
drivers/acpi/utils.c
+++ b/
drivers/acpi/utils.c
@@
-398,7
+398,7
@@
acpi_evaluate_reference(acpi_handle handle,
element = &(package->package.elements[i]);
element = &(package->package.elements[i]);
- if (element->type != ACPI_TYPE_
ANY
) {
+ if (element->type != ACPI_TYPE_
LOCAL_REFERENCE
) {
status = AE_BAD_DATA;
printk(KERN_ERR PREFIX
"Expecting a [Reference] package element, found type %X\n",
status = AE_BAD_DATA;
printk(KERN_ERR PREFIX
"Expecting a [Reference] package element, found type %X\n",
@@
-407,6
+407,12
@@
acpi_evaluate_reference(acpi_handle handle,
break;
}
break;
}
+ if (!element->reference.handle) {
+ printk(KERN_WARNING PREFIX "Invalid reference in"
+ " package %s\n", pathname);
+ status = AE_NULL_ENTRY;
+ break;
+ }
/* Get the acpi_handle. */
list->handles[i] = element->reference.handle;
/* Get the acpi_handle. */
list->handles[i] = element->reference.handle;