---

yaml --- r: 288167 b: refs/heads/master c: 81b5482 h: refs/heads/master i: 288165: f8b3174 288163: f4ba0f0 288159: 599e675 v: v3
git-mirror · Feb 23, 2012 · 1bd3bec · 1bd3bec
1 parent 30a3552
commit 1bd3bec
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: a60e8df64ddc6bd79c85a970f59f2967c968cfac
+refs/heads/master: 81b5482c32769abb6dfb979560dab2f952ba86fa
diff --git a/trunk/drivers/mfd/mfd-core.c b/trunk/drivers/mfd/mfd-core.c
@@ -123,7 +123,7 @@ static int mfd_add_device(struct device *parent, int id,
 		}
 
 		if (!cell->ignore_resource_conflicts) {
-			ret = acpi_check_resource_conflict(res);
+			ret = acpi_check_resource_conflict(&res[r]);
 			if (ret)
 				goto fail_res;
 		}