diff options
| author | Lee Jones <lee.jones@linaro.org> | 2013-12-19 15:55:00 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-01-07 15:37:19 +0000 |
| commit | a61f9e314ad8ab9434ddd989b857ed93fdc725e2 (patch) | |
| tree | c1f0a8337859d772a55d9319aaf94e1eba182ae5 | |
| parent | 0475680b5c2ef4bbdc3af1f6cfd014ea08c8d981 (diff) | |
| download | talos-obmc-linux-a61f9e314ad8ab9434ddd989b857ed93fdc725e2.tar.gz talos-obmc-linux-a61f9e314ad8ab9434ddd989b857ed93fdc725e2.zip | |
ASoC: ux500: Provide better checking for Device Tree and/or Platform Data
These drivers will not work without platform specific data, which is
passed in via Device Tree or Platform Data. To avoid the chance of
NULL pointer dereferencing and alike, let's ensure we have at least
one of the methods in play before continuing.
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Mark Brown <broonie@linaro.org>
| -rw-r--r-- | sound/soc/ux500/ux500_msp_dai.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sound/soc/ux500/ux500_msp_dai.c b/sound/soc/ux500/ux500_msp_dai.c index c6fb5cce980e..bc042cce115f 100644 --- a/sound/soc/ux500/ux500_msp_dai.c +++ b/sound/soc/ux500/ux500_msp_dai.c @@ -771,10 +771,14 @@ static const struct snd_soc_component_driver ux500_msp_component = { static int ux500_msp_drv_probe(struct platform_device *pdev) { struct ux500_msp_i2s_drvdata *drvdata; + struct msp_i2s_platform_data *pdata = pdev->dev.platform_data; + struct device_node *np = pdev->dev.of_node; int ret = 0; - dev_dbg(&pdev->dev, "%s: Enter (pdev->name = %s).\n", __func__, - pdev->name); + if (!pdata && !np) { + dev_err(&pdev->dev, "No platform data or Device Tree found\n"); + return -ENODEV; + } drvdata = devm_kzalloc(&pdev->dev, sizeof(struct ux500_msp_i2s_drvdata), |
