diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-12-30 16:22:11 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-12-30 16:22:11 +0100 |
| commit | 6a8484b63c421d3a69e6f560565d64e1de33d23d (patch) | |
| tree | f81e6868239c80e3480bd82ec3c2479d7a1c49fd /sound/soc/soc-pcm.c | |
| parent | 270384ccfc2ba3849b9d02f7a37c395987c30ed2 (diff) | |
| parent | 1b9f1ae8907cb13d3d2538d98385b2744c9490d5 (diff) | |
| download | op-kernel-dev-6a8484b63c421d3a69e6f560565d64e1de33d23d.zip op-kernel-dev-6a8484b63c421d3a69e6f560565d64e1de33d23d.tar.gz | |
Merge tag 'asoc-v3.19-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next
ASoC: Updates for v3.20
Nothing too exciting here yet, a small optimization for DAPM from
Lars-Peter and a few small bits and pieces for drivers but nothing
that really stands out.
Diffstat (limited to 'sound/soc/soc-pcm.c')
| -rw-r--r-- | sound/soc/soc-pcm.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index eb87d96e2..0ae0e2a 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -746,7 +746,8 @@ static int soc_pcm_prepare(struct snd_pcm_substream *substream) codec_dai); if (ret < 0) { dev_err(codec_dai->dev, - "ASoC: DAI prepare error: %d\n", ret); + "ASoC: codec DAI prepare error: %d\n", + ret); goto out; } } @@ -755,8 +756,8 @@ static int soc_pcm_prepare(struct snd_pcm_substream *substream) if (cpu_dai->driver->ops && cpu_dai->driver->ops->prepare) { ret = cpu_dai->driver->ops->prepare(substream, cpu_dai); if (ret < 0) { - dev_err(cpu_dai->dev, "ASoC: DAI prepare error: %d\n", - ret); + dev_err(cpu_dai->dev, + "ASoC: cpu DAI prepare error: %d\n", ret); goto out; } } |
