Skip to content

Commit

Permalink
ASoC: Intel: mfld-pcm: Allocate platform data
Browse files Browse the repository at this point in the history
Platform data may be null during platform_device_add. Allocate platform
data before using.

Signed-off-by: Subhransu S. Prusty <subhransu.s.prusty@intel.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
  • Loading branch information
Subhransu S. Prusty authored and Mark Brown committed Jul 31, 2014
1 parent 19a23a5 commit 2741d43
Showing 1 changed file with 7 additions and 1 deletion.
8 changes: 7 additions & 1 deletion sound/soc/intel/sst-mfld-platform-pcm.c
Original file line number Diff line number Diff line change
Expand Up @@ -570,14 +570,20 @@ static int sst_platform_probe(struct platform_device *pdev)
{
struct sst_data *drv;
int ret;
struct sst_platform_data *pdata = pdev->dev.platform_data;
struct sst_platform_data *pdata;

drv = devm_kzalloc(&pdev->dev, sizeof(*drv), GFP_KERNEL);
if (drv == NULL) {
pr_err("kzalloc failed\n");
return -ENOMEM;
}

pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL);
if (pdata == NULL) {
pr_err("kzalloc failed for pdata\n");
return -ENOMEM;
}

pdata->pdev_strm_map = dpcm_strm_map;
pdata->strm_map_size = ARRAY_SIZE(dpcm_strm_map);
drv->pdata = pdata;
Expand Down

0 comments on commit 2741d43

Please sign in to comment.