From 11bb2cfd8831e94f30676919f95446cb5da37cea Mon Sep 17 00:00:00 2001 From: Brian Harring Date: Tue, 19 Oct 2010 01:21:06 +0200 Subject: [PATCH] --- yaml --- r: 220620 b: refs/heads/master c: a28dbea0ad3bd8144f3348eb5c20fabc2f12b4b5 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/mfd/mfd-core.c | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 2e0cae36c710..b6cdf7411313 100644 --- 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 index d1c8605d4ed4..ec99f681e773 100644 --- 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;