diff options
| author | Mark Brown <broonie@linaro.org> | 2014-07-16 23:58:45 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-07-16 23:58:45 +0200 |
| commit | f7acb3694a999fdf04dc3096e8416a0bfdabd590 (patch) | |
| tree | 8e796f5a1d7d4b2c4398c0577174d0e9f77be3c7 /sound/soc/soc-pcm.c | |
| parent | ASoC: pcm: Refactor soc_pcm_apply_msb for multicodecs (diff) | |
| parent | ASoC: core: Move non-shared code paths out of snd_soc_post_component_init() (diff) | |
| download | linux-f7acb3694a999fdf04dc3096e8416a0bfdabd590.tar.xz linux-f7acb3694a999fdf04dc3096e8416a0bfdabd590.zip | |
Merge remote-tracking branch 'asoc/topic/component' into asoc-multi
Diffstat (limited to 'sound/soc/soc-pcm.c')
| -rw-r--r-- | sound/soc/soc-pcm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index 320a904b6b69..3bf0355ca30f 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -390,7 +390,7 @@ static int soc_pcm_open(struct snd_pcm_substream *substream) ret = platform->driver->ops->open(substream); if (ret < 0) { dev_err(platform->dev, "ASoC: can't open platform" - " %s: %d\n", platform->name, ret); + " %s: %d\n", platform->component.name, ret); goto platform_err; } } @@ -720,7 +720,7 @@ static int soc_pcm_hw_params(struct snd_pcm_substream *substream, ret = platform->driver->ops->hw_params(substream, params); if (ret < 0) { dev_err(platform->dev, "ASoC: %s hw params failed: %d\n", - platform->name, ret); + platform->component.name, ret); goto platform_err; } } |