diff options
| author | Jakub Kicinski <[email protected]> | 2022-05-12 22:39:02 +0000 |
|---|---|---|
| committer | Jakub Kicinski <[email protected]> | 2022-05-12 23:15:30 +0000 |
| commit | 9b19e57a3c78f1f7c08a48bafb7d84caf6e80b68 (patch) | |
| tree | 780e0a4b694b7b7aaabe7d7a0df38275e025fad8 /sound/soc/generic/simple-card-utils.c | |
| parent | Merge branch 'nfp-vf-rate-limit-support' (diff) | |
| parent | Merge tag 'net-5.18-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/net... (diff) | |
| download | kernel-9b19e57a3c78f1f7c08a48bafb7d84caf6e80b68.tar.gz kernel-9b19e57a3c78f1f7c08a48bafb7d84caf6e80b68.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
No conflicts.
Build issue in drivers/net/ethernet/sfc/ptp.c
54fccfdd7c66 ("sfc: efx_default_channel_type APIs can be static")
49e6123c65da ("net: sfc: fix memory leak due to ptp channel")
https://lore.kernel.org/all/[email protected]/
Signed-off-by: Jakub Kicinski <[email protected]>
Diffstat (limited to 'sound/soc/generic/simple-card-utils.c')
| -rw-r--r-- | sound/soc/generic/simple-card-utils.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/generic/simple-card-utils.c b/sound/soc/generic/simple-card-utils.c index f2157944247f..da0c27828ce6 100644 --- a/sound/soc/generic/simple-card-utils.c +++ b/sound/soc/generic/simple-card-utils.c @@ -322,7 +322,7 @@ void asoc_simple_shutdown(struct snd_pcm_substream *substream) if (props->mclk_fs && !dai->clk_fixed && !snd_soc_dai_active(cpu_dai)) snd_soc_dai_set_sysclk(cpu_dai, - 0, 0, SND_SOC_CLOCK_IN); + 0, 0, SND_SOC_CLOCK_OUT); asoc_simple_clk_disable(dai); } |