diff options
| author | Mark Brown <broonie@kernel.org> | 2019-06-06 22:44:24 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-06-06 22:44:24 +0100 |
| commit | a8e992342ce4cd173d437d0aa4eecc9e30489f72 (patch) | |
| tree | dbb45d586ed7370e32c006c506d6954d06779914 /sound/soc/intel/boards/bytcht_es8316.c | |
| parent | adb76b5b9c4740a11f6ad6c68764515961ae8ade (diff) | |
| parent | 04268bf2757a125616b6c2140e6250f43b7b737a (diff) | |
Merge branch 'asoc-5.2' into asoc-5.3
Diffstat (limited to 'sound/soc/intel/boards/bytcht_es8316.c')
| -rw-r--r-- | sound/soc/intel/boards/bytcht_es8316.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/intel/boards/bytcht_es8316.c b/sound/soc/intel/boards/bytcht_es8316.c index b56f9230d1bc..43cea6f1e748 100644 --- a/sound/soc/intel/boards/bytcht_es8316.c +++ b/sound/soc/intel/boards/bytcht_es8316.c @@ -496,6 +496,7 @@ static int snd_byt_cht_es8316_mc_probe(struct platform_device *pdev) } /* override plaform name, if required */ + byt_cht_es8316_card.dev = dev; platform_name = mach->mach_params.platform; ret = snd_soc_fixup_dai_links_platform_name(&byt_cht_es8316_card, @@ -576,7 +577,6 @@ static int snd_byt_cht_es8316_mc_probe(struct platform_device *pdev) (quirk & BYT_CHT_ES8316_MONO_SPEAKER) ? "mono" : "stereo", mic_name[BYT_CHT_ES8316_MAP(quirk)]); byt_cht_es8316_card.long_name = long_name; - byt_cht_es8316_card.dev = dev; snd_soc_card_set_drvdata(&byt_cht_es8316_card, priv); ret = devm_snd_soc_register_card(dev, &byt_cht_es8316_card); |