Merge tag ‘asoc-v5.1-2’ of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next [Linux 5.1]

Merge tag ‘asoc-v5.1-2’ of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next [Linux 5.1]

This Linux kernel change "Merge tag ‘asoc-v5.1-2’ of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next" is included in the Linux 5.1 release. This change is authored by Takashi Iwai <tiwai [at] suse.de> on Thu Feb 28 13:30:55 2019 +0100. The commit for this change in Linux stable tree is 70395a9 (patch). Other info about this change: Merge: f97a094 3146089

Merge tag 'asoc-v5.1-2' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next

ASoC: More changes for v5.1

Another batch of changes for ASoC, no big core changes - it's mainly
small fixes and improvements for individual drivers.

 - A big refresh and cleanup of the Samsung drivers, fixing a number of
   issues which allow the driver to be used with a wider range of
   userspaces.
 - Fixes for the Intel drivers to make them more standard so less likely
   to get bitten by core issues.
 - New driver for Cirrus Logic CS35L26.

There is no are 0 lines of Linux source code added/deleted in this change. Code changes to Linux kernel are as follows.

 sound/soc/stm/stm32_i2s.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sound/soc/stm/stm32_i2s.c b/sound/soc/stm/stm32_i2s.c
index 42ce87a..47c334d 100644
--- a/sound/soc/stm/stm32_i2s.c
+++ b/sound/soc/stm/stm32_i2s.c
@@ -623,8 +623,8 @@ static int stm32_i2s_trigger(struct snd_pcm_substream *substream, int cmd,
        } else {
            ier = I2S_IER_OVRIE;

-           if (i2s->refcount == 1)
-               /* dummy write to trigger capture */
+           if (STM32_I2S_IS_MASTER(i2s) && i2s->refcount == 1)
+               /* dummy write to gate bus clocks */
                regmap_write(i2s->regmap,
                         STM32_I2S_TXDR_REG, 0);
        }

Leave a Reply

Your email address will not be published. Required fields are marked *