diff options
| author |   Takashi Iwai <tiwai@suse.de> | 2020-01-20 11:44:35 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2020-01-20 11:44:51 +0100 |
| commit | 9d0af44c2ed036c663832f3b764ffd1109c8b79e (patch) | |
| tree | 629864b4ce2743873f672d2ca03c0e295fb98525 /sound/soc/stm/stm32_adfsdm.c | |
| parent | ALSA: hda/realtek - Add Headset Mic supported for HP cPC (diff) | |
| parent | ALSA: hda: Apply aligned MMIO access only conditionally (diff) | |
| download | linux-dev-9d0af44c2ed036c663832f3b764ffd1109c8b79e.tar.xz linux-dev-9d0af44c2ed036c663832f3b764ffd1109c8b79e.zip | |
Merge branch 'for-linus' into for-next
Resolved the merge conflict in HD-audio Tegra driver.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/soc/stm/stm32_adfsdm.c')
| -rw-r--r-- | sound/soc/stm/stm32_adfsdm.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sound/soc/stm/stm32_adfsdm.c b/sound/soc/stm/stm32_adfsdm.c index 81c407da15c5..08696a4adb69 100644 --- a/sound/soc/stm/stm32_adfsdm.c +++ b/sound/soc/stm/stm32_adfsdm.c @@ -153,13 +153,13 @@ static const struct snd_soc_component_driver stm32_adfsdm_dai_component = { .name = "stm32_dfsdm_audio", }; -static void memcpy_32to16(void *dest, const void *src, size_t n) +static void stm32_memcpy_32to16(void *dest, const void *src, size_t n) { unsigned int i = 0; u16 *d = (u16 *)dest, *s = (u16 *)src; s++; - for (i = n; i > 0; i--) { + for (i = n >> 1; i > 0; i--) { *d++ = *s++; s++; } @@ -186,8 +186,8 @@ static int stm32_afsdm_pcm_cb(const void *data, size_t size, void *private) if ((priv->pos + src_size) > buff_size) { if (format == SNDRV_PCM_FORMAT_S16_LE) - memcpy_32to16(&pcm_buff[priv->pos], src_buff, - buff_size - priv->pos); + stm32_memcpy_32to16(&pcm_buff[priv->pos], src_buff, + buff_size - priv->pos); else memcpy(&pcm_buff[priv->pos], src_buff, buff_size - priv->pos); @@ -196,8 +196,8 @@ static int stm32_afsdm_pcm_cb(const void *data, size_t size, void *private) } if (format == SNDRV_PCM_FORMAT_S16_LE) - memcpy_32to16(&pcm_buff[priv->pos], - &src_buff[src_size - cur_size], cur_size); + stm32_memcpy_32to16(&pcm_buff[priv->pos], + &src_buff[src_size - cur_size], cur_size); else memcpy(&pcm_buff[priv->pos], &src_buff[src_size - cur_size], cur_size); |