diff options
author | Liam Girdwood <liam.r.girdwood@linux.intel.com> | 2014-05-05 08:20:23 -0400 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-05-05 15:42:00 -0400 |
commit | e9024f0ba38a994c805743bc523693c5c7d7ccbc (patch) | |
tree | 84aa4b9e217b23f01e64464165af933835df70ed | |
parent | 51b4e24f383c84ed927fef348072b6dc65b9816d (diff) |
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 0b708c87f66a15190fb43661c2320fd48c4dc6c8
vim +/pdata +749 sound/soc/intel/sst-haswell-pcm.c
a4b12990 Mark Brown 2014-03-12 740 };
a4b12990 Mark Brown 2014-03-12 741
a4b12990 Mark Brown 2014-03-12 742 static int hsw_pcm_probe(struct snd_soc_platform *platform)
a4b12990 Mark Brown 2014-03-12 743 {
a4b12990 Mark Brown 2014-03-12 744 struct sst_pdata *pdata = dev_get_platdata(platform->dev);
a4b12990 Mark Brown 2014-03-12 745 struct hsw_priv_data *priv_data;
0b708c87 Liam Girdwood 2014-05-02 @746 struct device *dma_dev = pdata->dma_dev;
0b708c87 Liam Girdwood 2014-05-02 747 int i, ret = 0;
a4b12990 Mark Brown 2014-03-12 748
a4b12990 Mark Brown 2014-03-12 @749 if (!pdata)
a4b12990 Mark Brown 2014-03-12 750 return -ENODEV;
a4b12990 Mark Brown 2014-03-12 751
a4b12990 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>
-rw-r--r-- | sound/soc/intel/sst-haswell-pcm.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sound/soc/intel/sst-haswell-pcm.c b/sound/soc/intel/sst-haswell-pcm.c index 8c6bd33dd375..9d5f64a583a3 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) | |||
772 | { | 772 | { |
773 | struct sst_pdata *pdata = dev_get_platdata(platform->dev); | 773 | struct sst_pdata *pdata = dev_get_platdata(platform->dev); |
774 | struct hsw_priv_data *priv_data; | 774 | struct hsw_priv_data *priv_data; |
775 | struct device *dma_dev = pdata->dma_dev; | 775 | struct device *dma_dev; |
776 | int i, ret = 0; | 776 | int i, ret = 0; |
777 | 777 | ||
778 | if (!pdata) | 778 | if (!pdata) |
779 | return -ENODEV; | 779 | return -ENODEV; |
780 | 780 | ||
781 | dma_dev = pdata->dma_dev; | ||
782 | |||
781 | priv_data = devm_kzalloc(platform->dev, sizeof(*priv_data), GFP_KERNEL); | 783 | priv_data = devm_kzalloc(platform->dev, sizeof(*priv_data), GFP_KERNEL); |
782 | priv_data->hsw = pdata->dsp; | 784 | priv_data->hsw = pdata->dsp; |
783 | snd_soc_platform_set_drvdata(platform, priv_data); | 785 | snd_soc_platform_set_drvdata(platform, priv_data); |