Commit cff78735 authored by Takashi Iwai's avatar Takashi Iwai

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

ASoC: updates for 3.4

Slightly larger than normal - the DAPM fix is a "this should always have
worked" type of thing which is very clear and should have no impact on
systems that don't need it.  The WM8994 fix is driver specific but
pretty important for that driver.
parents 5ac57550 1a38336b
...@@ -929,6 +929,8 @@ static int cs42l73_set_mclk(struct snd_soc_dai *dai, unsigned int freq) ...@@ -929,6 +929,8 @@ static int cs42l73_set_mclk(struct snd_soc_dai *dai, unsigned int freq)
/* MCLKX -> MCLK */ /* MCLKX -> MCLK */
mclkx_coeff = cs42l73_get_mclkx_coeff(freq); mclkx_coeff = cs42l73_get_mclkx_coeff(freq);
if (mclkx_coeff < 0)
return mclkx_coeff;
mclk = cs42l73_mclkx_coeffs[mclkx_coeff].mclkx / mclk = cs42l73_mclkx_coeffs[mclkx_coeff].mclkx /
cs42l73_mclkx_coeffs[mclkx_coeff].ratio; cs42l73_mclkx_coeffs[mclkx_coeff].ratio;
......
This diff is collapsed.
...@@ -1001,11 +1001,10 @@ static void fsi_dma_do_tasklet(unsigned long data) ...@@ -1001,11 +1001,10 @@ static void fsi_dma_do_tasklet(unsigned long data)
sg_dma_address(&sg) = buf; sg_dma_address(&sg) = buf;
sg_dma_len(&sg) = len; sg_dma_len(&sg) = len;
desc = chan->device->device_prep_slave_sg(chan, &sg, 1, dir, desc = dmaengine_prep_slave_sg(chan, &sg, 1, dir,
DMA_PREP_INTERRUPT | DMA_PREP_INTERRUPT | DMA_CTRL_ACK);
DMA_CTRL_ACK);
if (!desc) { if (!desc) {
dev_err(dai->dev, "device_prep_slave_sg() fail\n"); dev_err(dai->dev, "dmaengine_prep_slave_sg() fail\n");
return; return;
} }
......
...@@ -3119,6 +3119,7 @@ int snd_soc_register_card(struct snd_soc_card *card) ...@@ -3119,6 +3119,7 @@ int snd_soc_register_card(struct snd_soc_card *card)
GFP_KERNEL); GFP_KERNEL);
if (card->rtd == NULL) if (card->rtd == NULL)
return -ENOMEM; return -ENOMEM;
card->num_rtd = 0;
card->rtd_aux = &card->rtd[card->num_links]; card->rtd_aux = &card->rtd[card->num_links];
for (i = 0; i < card->num_links; i++) for (i = 0; i < card->num_links; i++)
......
...@@ -67,6 +67,7 @@ static int dapm_up_seq[] = { ...@@ -67,6 +67,7 @@ static int dapm_up_seq[] = {
[snd_soc_dapm_out_drv] = 10, [snd_soc_dapm_out_drv] = 10,
[snd_soc_dapm_hp] = 10, [snd_soc_dapm_hp] = 10,
[snd_soc_dapm_spk] = 10, [snd_soc_dapm_spk] = 10,
[snd_soc_dapm_line] = 10,
[snd_soc_dapm_post] = 11, [snd_soc_dapm_post] = 11,
}; };
...@@ -75,6 +76,7 @@ static int dapm_down_seq[] = { ...@@ -75,6 +76,7 @@ static int dapm_down_seq[] = {
[snd_soc_dapm_adc] = 1, [snd_soc_dapm_adc] = 1,
[snd_soc_dapm_hp] = 2, [snd_soc_dapm_hp] = 2,
[snd_soc_dapm_spk] = 2, [snd_soc_dapm_spk] = 2,
[snd_soc_dapm_line] = 2,
[snd_soc_dapm_out_drv] = 2, [snd_soc_dapm_out_drv] = 2,
[snd_soc_dapm_pga] = 4, [snd_soc_dapm_pga] = 4,
[snd_soc_dapm_mixer_named_ctl] = 5, [snd_soc_dapm_mixer_named_ctl] = 5,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment