diff options
| author | Mark Brown <broonie@kernel.org> | 2020-03-02 14:39:08 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2020-03-02 14:39:08 +0000 |
| commit | cd1fa30142e2fc24ae81448f420197712d49d526 (patch) | |
| tree | cb8769c06c9e657814946707046a17914fe5a663 /sound/soc/codecs | |
| parent | fae664ebc79144fd9ac0bc9c2d3a36356aa48c29 (diff) | |
| parent | d237851d5d9dff5973160737197e825f05715ba3 (diff) | |
Merge branch 'for-5.6' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-5.7
Diffstat (limited to 'sound/soc/codecs')
| -rw-r--r-- | sound/soc/codecs/rt1015.c | 2 | ||||
| -rw-r--r-- | sound/soc/codecs/tas2562.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/codecs/rt1015.c b/sound/soc/codecs/rt1015.c index 100b8c89d537..5fa21d8ab620 100644 --- a/sound/soc/codecs/rt1015.c +++ b/sound/soc/codecs/rt1015.c @@ -857,7 +857,7 @@ static struct snd_soc_dai_driver rt1015_dai[] = { .rates = RT1015_STEREO_RATES, .formats = RT1015_FORMATS, }, - .ops = &rt1015_aif_dai_ops, + .ops = &rt1015_aif_dai_ops, } }; diff --git a/sound/soc/codecs/tas2562.c b/sound/soc/codecs/tas2562.c index 79c3c3d79766..6b7f7a18da36 100644 --- a/sound/soc/codecs/tas2562.c +++ b/sound/soc/codecs/tas2562.c @@ -276,7 +276,7 @@ static int tas2562_hw_params(struct snd_pcm_substream *substream, ret = tas2562_set_samplerate(tas2562, params_rate(params)); if (ret) - dev_err(tas2562->dev, "set bitwidth failed, %d\n", ret); + dev_err(tas2562->dev, "set sample rate failed, %d\n", ret); return ret; } |