diff options
| author | Markus Elfring <elfring@users.sourceforge.net> | 2015-07-23 06:53:28 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-07-23 23:09:08 +0200 |
| commit | dc67d0fa8612ad49a8ec36040c5d22a9091bdbf6 (patch) | |
| tree | 2e50879f59d8b643efdc5c4937c0cf95459aaefe /drivers/acpi | |
| parent | ACPICA: Parser: Remove redundant opcode execution debugging output (diff) | |
| download | linux-dc67d0fa8612ad49a8ec36040c5d22a9091bdbf6.tar.xz linux-dc67d0fa8612ad49a8ec36040c5d22a9091bdbf6.zip | |
ACPICA: Remove extraneous check for null walk_state
ACPICA commit f9fd6e8bad0f16ce2b436c5cda36ced0c2d85302
Reported by Markus Elfring.
Link: https://github.com/acpica/acpica/commit/f9fd6e8b
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Lv Zheng <lv.zheng@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/acpi')
| -rw-r--r-- | drivers/acpi/acpica/dsmethod.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/acpi/acpica/dsmethod.c b/drivers/acpi/acpica/dsmethod.c index ea2bdde1227e..cb53c44c9644 100644 --- a/drivers/acpi/acpica/dsmethod.c +++ b/drivers/acpi/acpica/dsmethod.c @@ -582,9 +582,7 @@ cleanup: /* On error, we must terminate the method properly */ acpi_ds_terminate_control_method(obj_desc, next_walk_state); - if (next_walk_state) { - acpi_ds_delete_walk_state(next_walk_state); - } + acpi_ds_delete_walk_state(next_walk_state); return_ACPI_STATUS(status); } |