lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge tag 'asoc-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

Browse Source 
ASoC: A few more updates for 3.4

The cleanup of the dmaengine parameter messup and a tweak to some
callibration values for WM1811.
This commit is contained in:
Takashi Iwai
2012-03-29 17:56:00 +02:00
parent a938fb1ef6 41ba6b711a
commit d1045b6a9a
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sound/soc/codecs/wm8994.c
View File

@@ -3652,7 +3652,7 @@ static int wm8994_codec_probe(struct snd_soc_codec *codec)
case 2: case 2:
case 3: case 3:
wm8994->hubs.dcs_codes_l = -9; wm8994->hubs.dcs_codes_l = -9;
wm8994->hubs.dcs_codes_r = -5; wm8994->hubs.dcs_codes_r = -7;
break; break;
default: default:
break; break;

2
sound/soc/soc-dmaengine-pcm.c
View File

@@ -143,7 +143,7 @@ static int dmaengine_pcm_prepare_and_submit(struct snd_pcm_substream *substream)
direction = snd_pcm_substream_to_dma_direction(substream); direction = snd_pcm_substream_to_dma_direction(substream);
prtd->pos = 0; prtd->pos = 0;
desc = chan->device->device_prep_dma_cyclic(chan, desc = dmaengine_prep_dma_cyclic(chan,
substream->runtime->dma_addr, substream->runtime->dma_addr,
snd_pcm_lib_buffer_bytes(substream), snd_pcm_lib_buffer_bytes(substream),
snd_pcm_lib_period_bytes(substream), direction); snd_pcm_lib_period_bytes(substream), direction);