diff options
| author | Xiubo Li <Li.Xiubo@freescale.com> | 2014-01-09 04:19:08 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-01-09 12:35:46 -0500 |
| commit | 708ec0241c56b85176937e79314430f4f71e40c6 (patch) | |
| tree | 67b8da70df74a3ff8f2e6c21418ec168e41ea971 | |
| parent | 8c0b8230b2d9708eed5b50f9f8442aaa879a3c57 (diff) | |
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>
| -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) | |||
| 213 | } | 213 | } |
| 214 | } | 214 | } |
| 215 | } else { | 215 | } else { |
| 216 | cinfo->snd_card.dev = &pdev->dev; | ||
| 217 | cinfo = pdev->dev.platform_data; | 216 | cinfo = pdev->dev.platform_data; |
| 217 | cinfo->snd_card.dev = &pdev->dev; | ||
| 218 | } | 218 | } |
| 219 | 219 | ||
| 220 | if (!cinfo) { | 220 | if (!cinfo) { |
