Skip to content

Commit

Permalink
ASoC: core: Ensure SND_SOC_BYTES writes are from DMA safe memory
Browse files Browse the repository at this point in the history
With some buses the transfers may DMAed, especially for larger blocks.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
  • Loading branch information
Mark Brown committed Jan 21, 2013
1 parent 5d16333 commit b5a8fe4
Showing 1 changed file with 5 additions and 7 deletions.
12 changes: 5 additions & 7 deletions sound/soc/soc-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -3097,9 +3097,12 @@ int snd_soc_bytes_put(struct snd_kcontrol *kcontrol,
if (!codec->using_regmap)
return -EINVAL;

data = ucontrol->value.bytes.data;
len = params->num_regs * codec->val_bytes;

data = kmemdup(ucontrol->value.bytes.data, len, GFP_KERNEL | GFP_DMA);
if (!data)
return -ENOMEM;

/*
* If we've got a mask then we need to preserve the register
* bits. We shouldn't modify the incoming data so take a
Expand All @@ -3112,10 +3115,6 @@ int snd_soc_bytes_put(struct snd_kcontrol *kcontrol,

val &= params->mask;

data = kmemdup(data, len, GFP_KERNEL);
if (!data)
return -ENOMEM;

switch (codec->val_bytes) {
case 1:
((u8 *)data)[0] &= ~params->mask;
Expand All @@ -3137,8 +3136,7 @@ int snd_soc_bytes_put(struct snd_kcontrol *kcontrol,
ret = regmap_raw_write(codec->control_data, params->base,
data, len);

if (params->mask)
kfree(data);
kfree(data);

return ret;
}
Expand Down

0 comments on commit b5a8fe4

Please sign in to comment.