diff options
| author | Wei Yongjun <yongjun_wei@trendmicro.com.cn> | 2013-11-09 08:41:14 +0800 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-12-02 11:13:19 +0000 |
| commit | 6c7ef410c986db7e57b83231427e4606a225606b (patch) | |
| tree | a12d12600805fce20a512d1d8ae195eec7ee384e /sound | |
| parent | 23d8bb3bb65e3587ceff54e1b54dda3c48a14f28 (diff) | |
| download | kernel-common-6c7ef410c986db7e57b83231427e4606a225606b.tar.gz kernel-common-6c7ef410c986db7e57b83231427e4606a225606b.tar.bz2 kernel-common-6c7ef410c986db7e57b83231427e4606a225606b.zip | |
ASoC: fsl: set correct platform drvdata in pcm030_fabric_probe()
platform_set_drvdata(op, pdata) in pcm030_fabric_probe()
will be overwrited when calling snd_soc_register_card(card),
but cm030_fabric_remove() use drvdata as a type of struct
pcm030_audio_data, so we should move platform_set_drvdata()
below snd_soc_register_card() call.
Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/fsl/pcm030-audio-fabric.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/soc/fsl/pcm030-audio-fabric.c b/sound/soc/fsl/pcm030-audio-fabric.c index eb4373840bb6..3665f612819d 100644 --- a/sound/soc/fsl/pcm030-audio-fabric.c +++ b/sound/soc/fsl/pcm030-audio-fabric.c @@ -69,7 +69,6 @@ static int pcm030_fabric_probe(struct platform_device *op) return -ENOMEM; card->dev = &op->dev; - platform_set_drvdata(op, pdata); pdata->card = card; @@ -98,6 +97,8 @@ static int pcm030_fabric_probe(struct platform_device *op) if (ret) dev_err(&op->dev, "snd_soc_register_card() failed: %d\n", ret); + platform_set_drvdata(op, pdata); + return ret; } |