diff options
| author | Mark Brown <broonie@kernel.org> | 2020-07-31 19:54:03 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2020-07-31 19:54:03 +0100 |
| commit | 84569f329f7fcb40b7b1860f273b2909dabf2a2b (patch) | |
| tree | cd332fbb2947f20cc06e3b80da75b189c8ac624e /sound/soc/meson/meson-card-utils.c | |
| parent | c8f7dbdbaa15c700ea02abf92b8d9bda2e91050b (diff) | |
| parent | 8e34f1e867b572f1e20b5250c2897fe5f041c99f (diff) | |
Merge remote-tracking branch 'asoc/for-5.9' into asoc-next
Diffstat (limited to 'sound/soc/meson/meson-card-utils.c')
| -rw-r--r-- | sound/soc/meson/meson-card-utils.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/meson/meson-card-utils.c b/sound/soc/meson/meson-card-utils.c index c734131ff0d6..6a64ac01b5ca 100644 --- a/sound/soc/meson/meson-card-utils.c +++ b/sound/soc/meson/meson-card-utils.c @@ -13,7 +13,7 @@ int meson_card_i2s_set_sysclk(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params, unsigned int mclk_fs) { - struct snd_soc_pcm_runtime *rtd = substream->private_data; + struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); struct snd_soc_dai *codec_dai; unsigned int mclk; int ret, i; @@ -119,7 +119,7 @@ unsigned int meson_card_parse_daifmt(struct device_node *node, struct device_node *framemaster = NULL; unsigned int daifmt; - daifmt = snd_soc_of_parse_daifmt(node, DT_PREFIX, + daifmt = snd_soc_of_parse_daifmt(node, "", &bitclkmaster, &framemaster); daifmt &= ~SND_SOC_DAIFMT_MASTER_MASK; |