---

yaml --- r: 296843 b: refs/heads/master c: 855cc45 h: refs/heads/master i: 296841: 813f54c 296839: 12cffe1 v: v3
git-mirror · Mar 6, 2012 · 6131ea2 · 6131ea2
1 parent 6f96da7
commit 6131ea2
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: ee42b3aa3791263a6cca36856b306cd1ae897ebf
+refs/heads/master: 855cc454341c6ca1212bf86939f2f2a51ab54e18
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;
 		}