diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-08-13 04:51:49 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-08-13 04:51:49 -0700 |
| commit | d7a405721991ef24d110892c69ac18ba2f21a42f (patch) | |
| tree | 9a73234ce11e80ef7bed710257e8d07e6f132169 | |
| parent | 2e3eed92118411a0aa60d4eb1bf574b23808d997 (diff) | |
| parent | a9aa872509f48fe791a7df274eeb054df81192d6 (diff) | |
Merge "ASoC: msmcobalt: fix wrong platform device pointer assignment"
| -rw-r--r-- | sound/soc/msm/msmcobalt.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/soc/msm/msmcobalt.c b/sound/soc/msm/msmcobalt.c index 4b2b7611328a..763854061966 100644 --- a/sound/soc/msm/msmcobalt.c +++ b/sound/soc/msm/msmcobalt.c @@ -3971,8 +3971,6 @@ static int msm_asoc_machine_probe(struct platform_device *pdev) goto err; } - spdev = pdev; - ret = msm_populate_dai_link_component_of_node(card); if (ret) { ret = -EPROBE_DEFER; @@ -4010,6 +4008,7 @@ static int msm_asoc_machine_probe(struct platform_device *pdev) goto err; } dev_info(&pdev->dev, "Sound card %s registered\n", card->name); + spdev = pdev; ret = of_property_read_string(pdev->dev.of_node, "qcom,mbhc-audio-jack-type", &mbhc_audio_jack_type); |