diff options
author | Xiubo Li <Li.Xiubo@freescale.com> | 2014-01-09 17:19:08 +0800 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-01-09 17:35:46 +0000 |
commit | 708ec0241c56b85176937e79314430f4f71e40c6 (patch) | |
tree | 67b8da70df74a3ff8f2e6c21418ec168e41ea971 /sound/soc/generic | |
parent | 8c0b8230b2d9708eed5b50f9f8442aaa879a3c57 (diff) | |
download | linux-stable-708ec0241c56b85176937e79314430f4f71e40c6.tar.gz linux-stable-708ec0241c56b85176937e79314430f4f71e40c6.tar.bz2 linux-stable-708ec0241c56b85176937e79314430f4f71e40c6.zip |
ASoC: simple-card: fix a bug where cinfo will be NULL before using it
If the dt is not used, the cinfo will be always NULL before using it.
Signed-off-by: Xiubo Li <Li.Xiubo@freescale.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound/soc/generic')
-rw-r--r-- | sound/soc/generic/simple-card.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c index 0430be85f23c..6c61b1758f78 100644 --- a/sound/soc/generic/simple-card.c +++ b/sound/soc/generic/simple-card.c @@ -213,8 +213,8 @@ static int asoc_simple_card_probe(struct platform_device *pdev) } } } else { - cinfo->snd_card.dev = &pdev->dev; cinfo = pdev->dev.platform_data; + cinfo->snd_card.dev = &pdev->dev; } if (!cinfo) { |