diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-03-29 17:56:00 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-03-29 17:56:00 +0200 |
| commit | d1045b6a9a73dc6bead25fe200b5b4e7feed7357 (patch) | |
| tree | 5503ee1149e4f94d3eef56d887ea07736171bfd3 | |
| parent | a938fb1ef600c885f80e59b840a60894d16efb77 (diff) | |
| parent | 41ba6b711a40b83a877ae8242a4b3e692de91f97 (diff) | |
| download | linux-d1045b6a9a73dc6bead25fe200b5b4e7feed7357.tar.bz2 | |
Merge tag 'asoc-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: A few more updates for 3.4
The cleanup of the dmaengine parameter messup and a tweak to some
callibration values for WM1811.
| -rw-r--r-- | sound/soc/codecs/wm8994.c | 2 | ||||
| -rw-r--r-- | sound/soc/soc-dmaengine-pcm.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c index 9685dff44dd8..10d27890eed5 100644 --- a/sound/soc/codecs/wm8994.c +++ b/sound/soc/codecs/wm8994.c @@ -3652,7 +3652,7 @@ static int wm8994_codec_probe(struct snd_soc_codec *codec) case 2: case 3: wm8994->hubs.dcs_codes_l = -9; - wm8994->hubs.dcs_codes_r = -5; + wm8994->hubs.dcs_codes_r = -7; break; default: break; diff --git a/sound/soc/soc-dmaengine-pcm.c b/sound/soc/soc-dmaengine-pcm.c index 4420b7030c83..475695234b3d 100644 --- a/sound/soc/soc-dmaengine-pcm.c +++ b/sound/soc/soc-dmaengine-pcm.c @@ -143,7 +143,7 @@ static int dmaengine_pcm_prepare_and_submit(struct snd_pcm_substream *substream) direction = snd_pcm_substream_to_dma_direction(substream); prtd->pos = 0; - desc = chan->device->device_prep_dma_cyclic(chan, + desc = dmaengine_prep_dma_cyclic(chan, substream->runtime->dma_addr, snd_pcm_lib_buffer_bytes(substream), snd_pcm_lib_period_bytes(substream), direction); |