Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit a28dbea0ad3bd8144f3348eb5c20fabc2f12b4b5

Authored by Brian Harring
Committed by Samuel Ortiz
1 parent 11c39c4bde
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

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>

Showing 1 changed file with 6 additions and 4 deletions Side-by-side Diff

drivers/mfd/mfd-core.c
Diff comments   View file @ a28dbea
... ... @@ -38,10 +38,12 @@
38 38 pdev->dev.parent = parent;
39 39 platform_set_drvdata(pdev, cell->driver_data);
40 40  
41   - ret = platform_device_add_data(pdev,
42   - cell->platform_data, cell->data_size);
43   - if (ret)
44   - goto fail_res;
  41 + if (cell->data_size) {
  42 + ret = platform_device_add_data(pdev,
  43 + cell->platform_data, cell->data_size);
  44 + if (ret)
  45 + goto fail_res;
  46 + }
45 47  
46 48 for (r = 0; r < cell->num_resources; r++) {
47 49 res[r].name = cell->resources[r].name;