git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branches 'acpi_pad', 'acpica', 'apei-bugzilla-43282', 'battery', 'cpuidle-coupl...
[sfrench/cifs-2.6.git]
/
drivers
/
acpi
/
acpica
/
nspredef.c
diff --git
a/drivers/acpi/acpica/nspredef.c
b/drivers/acpi/acpica/nspredef.c
index 10b85aecd16e6eb95d127846dc1f21c663a0d9e2..2419f417ea33220f5ee04212866499a476b6ed51 100644
(file)
--- a/
drivers/acpi/acpica/nspredef.c
+++ b/
drivers/acpi/acpica/nspredef.c
@@
-638,7
+638,7
@@
acpi_ns_check_package(struct acpi_predefined_data *data,
/* Create the new outer package and populate it */
status =
- acpi_ns_wrap_with_package(data,
*elements
,
+ acpi_ns_wrap_with_package(data,
return_object
,
return_object_ptr);
if (ACPI_FAILURE(status)) {
return (status);