From 8a4ceb4beb72047a126b9d970faee845149f60d5 Mon Sep 17 00:00:00 2001
From: Liam Girdwood <liam.r.girdwood@linux.intel.com>
Date: Mon, 5 May 2014 13:20:23 +0100
Subject: [PATCH] ASoC: Intel: Fix check for pdata usage before dereference.
This patch fixes the following dereference check ordering.
sound/soc/intel/sst-haswell-pcm.c:749 hsw_pcm_probe() warn: variable dereferenced before check 'pdata' (see line 746)
git remote add asoc git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
git remote update asoc
git checkout 7ea94fb4d117a3c481a9d92229bcdee21fc32696
vim +/pdata +749 sound/soc/intel/sst-haswell-pcm.c
b91c8f2c Mark Brown 2014-03-12 740 };
b91c8f2c Mark Brown 2014-03-12 741
b91c8f2c Mark Brown 2014-03-12 742 static int hsw_pcm_probe(struct snd_soc_platform *platform)
b91c8f2c Mark Brown 2014-03-12 743 {
b91c8f2c Mark Brown 2014-03-12 744 struct sst_pdata *pdata = dev_get_platdata(platform->dev);
b91c8f2c Mark Brown 2014-03-12 745 struct hsw_priv_data *priv_data;
7ea94fb4 Liam Girdwood 2014-05-02 @746 struct device *dma_dev = pdata->dma_dev;
7ea94fb4 Liam Girdwood 2014-05-02 747 int i, ret = 0;
b91c8f2c Mark Brown 2014-03-12 748
b91c8f2c Mark Brown 2014-03-12 @749 if (!pdata)
b91c8f2c Mark Brown 2014-03-12 750 return -ENODEV;
b91c8f2c Mark Brown 2014-03-12 751
b91c8f2c Mark Brown 2014-03-12 752 priv_data = devm_kzalloc(platform->dev, sizeof(*priv_data), GFP_KERNEL);
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
---
sound/soc/intel/sst-haswell-pcm.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/sound/soc/intel/sst-haswell-pcm.c b/sound/soc/intel/sst-haswell-pcm.c
index 8c6bd33dd375a..9d5f64a583a38 100644
--- a/sound/soc/intel/sst-haswell-pcm.c
+++ b/sound/soc/intel/sst-haswell-pcm.c
@@ -772,12 +772,14 @@ static int hsw_pcm_probe(struct snd_soc_platform *platform)
{
struct sst_pdata *pdata = dev_get_platdata(platform->dev);
struct hsw_priv_data *priv_data;
- struct device *dma_dev = pdata->dma_dev;
+ struct device *dma_dev;
int i, ret = 0;
if (!pdata)
return -ENODEV;
+ dma_dev = pdata->dma_dev;
+
priv_data = devm_kzalloc(platform->dev, sizeof(*priv_data), GFP_KERNEL);
priv_data->hsw = pdata->dsp;
snd_soc_platform_set_drvdata(platform, priv_data);
--
2.39.5