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 branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux...
[sfrench/cifs-2.6.git]
/
drivers
/
acpi
/
utilities
/
utobject.c
diff --git
a/drivers/acpi/utilities/utobject.c
b/drivers/acpi/utilities/utobject.c
index 76ee766c84f948ed2d8749f06486338a792f7e05..e08b3fa6639f593c0c1d4c893d591be26d36243c 100644
(file)
--- a/
drivers/acpi/utilities/utobject.c
+++ b/
drivers/acpi/utilities/utobject.c
@@
-432,7
+432,7
@@
acpi_ut_get_simple_object_size(union acpi_operand_object *internal_object,
* element -- which is legal)
*/
if (!internal_object) {
- *obj_length =
0
;
+ *obj_length =
sizeof(union acpi_object)
;
return_ACPI_STATUS(AE_OK);
}