diff --git a/[refs] b/[refs]
index 08017268a71b..8a74509744b8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8e345c991c8c7a3c081199ef77deada79e37618a
+refs/heads/master: 8a66790b7850a6669129af078768a1d42076a0ef
diff --git a/trunk/drivers/acpi/resource.c b/trunk/drivers/acpi/resource.c
index 2bafc25482b3..4107c004467a 100644
--- a/trunk/drivers/acpi/resource.c
+++ b/trunk/drivers/acpi/resource.c
@@ -446,7 +446,7 @@ static acpi_status acpi_dev_process_resource(struct acpi_resource *ares,
 		ret = c->preproc(ares, c->preproc_data);
 		if (ret < 0) {
 			c->error = ret;
-			return AE_ABORT_METHOD;
+			return AE_CTRL_TERMINATE;
 		} else if (ret > 0) {
 			return AE_OK;
 		}