diff options
| author | Brian Harring <ferringb@gmail.com> | 2010-10-19 01:21:06 +0200 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2010-10-29 00:30:03 +0200 |
| commit | a28dbea0ad3bd8144f3348eb5c20fabc2f12b4b5 (patch) | |
| tree | d65e247eca308c886f9ebf966ab1353396bb7e61 | |
| parent | 11c39c4bde7acb727f7a7c6a4d7ffeb95b64dbb4 (diff) | |
| download | linux-3.10-a28dbea0ad3bd8144f3348eb5c20fabc2f12b4b5.tar.gz linux-3.10-a28dbea0ad3bd8144f3348eb5c20fabc2f12b4b5.tar.bz2 linux-3.10-a28dbea0ad3bd8144f3348eb5c20fabc2f12b4b5.zip | |
mfd: Add devices platform data when the cell data size is not 0
When the cell data_size is 0, the resulting platform_data pointer will be
set to ZERO_SIZE_PTR. That could be misleading for device drivers running
a NULL check on thei platform_data pointer before dereferencing it.
Signed-off-by: Brian Harring <ferringb@gmail.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
| -rw-r--r-- | drivers/mfd/mfd-core.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/mfd/mfd-core.c b/drivers/mfd/mfd-core.c index d1c8605d4ed..ec99f681e77 100644 --- a/drivers/mfd/mfd-core.c +++ b/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; |