---

yaml --- r: 336623 b: refs/heads/master c: 8a66790 h: refs/heads/master i: 336621: c30984e 336619: 0b1d33a 336615: 65ed381 336607: d24d8b2 v: v3
git-mirror · Nov 16, 2012 · 74e49af · 74e49af
1 parent 324678a
commit 74e49af
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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;
 		}