Merge branches 'pm-cpufreq', 'pm-cpuidle', 'pm-devfreq', 'pm-opp' and 'pm-tools'

[linux-drm-fsl-dcu.git] / drivers / acpi / acpica / psloop.c

diff --git a/drivers/acpi/acpica/psloop.c b/drivers/acpi/acpica/psloop.c
index 646d1a3f6e27b7e5695aaec30746ba4bd4c9aa53..90437227d79095fdaec394eb101c90d73543f961 100644 (file)
--- a/drivers/acpi/acpica/psloop.c
+++ b/drivers/acpi/acpica/psloop.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2014, Intel Corp.
+ * Copyright (C) 2000 - 2015, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -480,6 +480,10 @@ acpi_status acpi_ps_parse_loop(struct acpi_walk_state *walk_state)
                                        status = AE_OK;
                                }
 
+                               if (status == AE_CTRL_TERMINATE) {
+                                       return_ACPI_STATUS(status);
+                               }
+
                                status =
                                    acpi_ps_complete_op(walk_state, &op,
                                                        status);