diff options
| author | Mark Brown <broonie@kernel.org> | 2014-09-02 23:33:38 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-09-02 23:33:38 +0100 |
| commit | e65f6b1eb54036682786cb64d99c64d074ff4357 (patch) | |
| tree | 70d5cc655365844e7b11aaf1ddae2138a2f183e9 /sound/soc | |
| parent | 69e273c0b0a3c337a521d083374c918dc52c666f (diff) | |
| parent | 4d61b39bc117b36682c1dd67ee386960ae826bef (diff) | |
| download | linux-e65f6b1eb54036682786cb64d99c64d074ff4357.tar.gz linux-e65f6b1eb54036682786cb64d99c64d074ff4357.tar.bz2 linux-e65f6b1eb54036682786cb64d99c64d074ff4357.zip | |
Merge remote-tracking branch 'asoc/fix/core' into asoc-linus
Diffstat (limited to 'sound/soc')
| -rw-r--r-- | sound/soc/soc-core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index d4bfd4a9076f..889f4e3d35dc 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -1325,7 +1325,7 @@ static int soc_post_component_init(struct snd_soc_pcm_runtime *rtd, device_initialize(rtd->dev); rtd->dev->parent = rtd->card->dev; rtd->dev->release = rtd_release; - rtd->dev->init_name = name; + dev_set_name(rtd->dev, "%s", name); dev_set_drvdata(rtd->dev, rtd); mutex_init(&rtd->pcm_mutex); INIT_LIST_HEAD(&rtd->dpcm[SNDRV_PCM_STREAM_PLAYBACK].be_clients); |