summaryrefslogtreecommitdiff
path: root/sound/soc/soc-pcm.c
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-07-16 22:58:45 +0100
committerMark Brown <broonie@linaro.org>2014-07-16 22:58:45 +0100
commitf7acb3694a999fdf04dc3096e8416a0bfdabd590 (patch)
tree8e796f5a1d7d4b2c4398c0577174d0e9f77be3c7 /sound/soc/soc-pcm.c
parentc8dd1fec47d0b1875f292c40bed381b343e38b40 (diff)
parent5f3484ac8775a183f855fd213907c4221d2fb11f (diff)
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.c4
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;
}
}