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 | |
| parent | 69e273c0b0a3c337a521d083374c918dc52c666f (diff) | |
| parent | 4d61b39bc117b36682c1dd67ee386960ae826bef (diff) | |
| download | test-e65f6b1eb54036682786cb64d99c64d074ff4357.tar.gz | |
Merge remote-tracking branch 'asoc/fix/core' into asoc-linus
| -rw-r--r-- | include/sound/soc.h | 2 | ||||
| -rw-r--r-- | sound/soc/soc-core.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/sound/soc.h b/include/sound/soc.h index be6ecae247b0c..c83a334dd00fa 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -277,7 +277,7 @@ .access = SNDRV_CTL_ELEM_ACCESS_TLV_READWRITE | \ SNDRV_CTL_ELEM_ACCESS_TLV_CALLBACK, \ .tlv.c = (snd_soc_bytes_tlv_callback), \ - .info = snd_soc_info_bytes_ext, \ + .info = snd_soc_bytes_info_ext, \ .private_value = (unsigned long)&(struct soc_bytes_ext) \ {.max = xcount, .get = xhandler_get, .put = xhandler_put, } } #define SOC_SINGLE_XR_SX(xname, xregbase, xregcount, xnbits, \ diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index d4bfd4a9076fe..889f4e3d35dc5 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); |