---

yaml --- r: 220620 b: refs/heads/master c: a28dbea h: refs/heads/master v: v3
git-mirror · Oct 28, 2010 · 11bb2cf · 11bb2cf
1 parent 0fb738f
commit 11bb2cf
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 11c39c4bde7acb727f7a7c6a4d7ffeb95b64dbb4
+refs/heads/master: a28dbea0ad3bd8144f3348eb5c20fabc2f12b4b5
diff --git a/trunk/drivers/mfd/mfd-core.c b/trunk/drivers/mfd/mfd-core.c
@@ -38,10 +38,12 @@ static int mfd_add_device(struct device *parent, int id,
 	pdev->dev.parent = parent;
 	platform_set_drvdata(pdev, cell->driver_data);
 
-	ret = platform_device_add_data(pdev,
-			cell->platform_data, cell->data_size);
-	if (ret)
-		goto fail_res;
+	if (cell->data_size) {
+		ret = platform_device_add_data(pdev,
+					cell->platform_data, cell->data_size);
+		if (ret)
+			goto fail_res;
+	}
 
 	for (r = 0; r < cell->num_resources; r++) {
 		res[r].name = cell->resources[r].name;