diff options
| author | Michal Marek <mmarek@suse.cz> | 2014-01-02 14:02:06 +0100 |
|---|---|---|
| committer | Michal Marek <mmarek@suse.cz> | 2014-01-02 14:02:06 +0100 |
| commit | 37e2c2a775fc887acd1432908478dfd532f7f00f (patch) | |
| tree | e51ebc699d8e262fd47e0913be6a711cb1a7b565 /drivers/acpi/acpica/dsobject.c | |
| parent | deb-pkg: Inhibit initramfs builders if CONFIG_BLK_DEV_INITRD is not set (diff) | |
| parent | Linux 3.13-rc1 (diff) | |
| download | linux-37e2c2a775fc887acd1432908478dfd532f7f00f.tar.xz linux-37e2c2a775fc887acd1432908478dfd532f7f00f.zip | |
Merge commit v3.13-rc1 into kbuild/misc
Diffstat (limited to 'drivers/acpi/acpica/dsobject.c')
| -rw-r--r-- | drivers/acpi/acpica/dsobject.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/acpica/dsobject.c b/drivers/acpi/acpica/dsobject.c index 63f0d220ca3d..b1746a68dad1 100644 --- a/drivers/acpi/acpica/dsobject.c +++ b/drivers/acpi/acpica/dsobject.c @@ -240,7 +240,7 @@ acpi_ds_build_internal_object(struct acpi_walk_state *walk_state, return_ACPI_STATUS(status); } - exit: +exit: *obj_desc_ptr = obj_desc; return_ACPI_STATUS(status); } |