Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d1045b6a authored by Takashi Iwai's avatar Takashi Iwai
Browse files

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.
parents a938fb1e 41ba6b71

sound/soc/codecs/wm8994.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

sound/soc/soc-dmaengine-pcm.c

+1 −1
Original line number Diff line number Diff line
@@ -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);