Merge branch 'for-2.6.37' into for-2.6.38
This commit is contained in:
commit
ab4e57446f
|
@ -710,7 +710,7 @@ static int wm8961_hw_params(struct snd_pcm_substream *substream,
|
|||
if (fs <= 24000)
|
||||
reg |= WM8961_DACSLOPE;
|
||||
else
|
||||
reg &= WM8961_DACSLOPE;
|
||||
reg &= ~WM8961_DACSLOPE;
|
||||
snd_soc_write(codec, WM8961_ADC_DAC_CONTROL_2, reg);
|
||||
|
||||
return 0;
|
||||
|
@ -735,7 +735,7 @@ static int wm8961_set_sysclk(struct snd_soc_dai *dai, int clk_id,
|
|||
freq /= 2;
|
||||
} else {
|
||||
dev_dbg(codec->dev, "Using MCLK/1 for %dHz MCLK\n", freq);
|
||||
reg &= WM8961_MCLKDIV;
|
||||
reg &= ~WM8961_MCLKDIV;
|
||||
}
|
||||
|
||||
snd_soc_write(codec, WM8961_CLOCKING1, reg);
|
||||
|
|
|
@ -384,7 +384,6 @@ out0:
|
|||
|
||||
static int __devexit nuc900_ac97_drvremove(struct platform_device *pdev)
|
||||
{
|
||||
|
||||
snd_soc_unregister_dai(&pdev->dev);
|
||||
|
||||
clk_put(nuc900_ac97_data->clk);
|
||||
|
@ -392,6 +391,7 @@ static int __devexit nuc900_ac97_drvremove(struct platform_device *pdev)
|
|||
release_mem_region(nuc900_ac97_data->res->start,
|
||||
resource_size(nuc900_ac97_data->res));
|
||||
|
||||
kfree(nuc900_ac97_data);
|
||||
nuc900_ac97_data = NULL;
|
||||
|
||||
return 0;
|
||||
|
|
|
@ -644,15 +644,23 @@ static int omap_mcbsp_dai_set_dai_sysclk(struct snd_soc_dai *cpu_dai,
|
|||
|
||||
|
||||
case OMAP_MCBSP_CLKR_SRC_CLKR:
|
||||
if (cpu_class_is_omap1())
|
||||
break;
|
||||
omap2_mcbsp1_mux_clkr_src(CLKR_SRC_CLKR);
|
||||
break;
|
||||
case OMAP_MCBSP_CLKR_SRC_CLKX:
|
||||
if (cpu_class_is_omap1())
|
||||
break;
|
||||
omap2_mcbsp1_mux_clkr_src(CLKR_SRC_CLKX);
|
||||
break;
|
||||
case OMAP_MCBSP_FSR_SRC_FSR:
|
||||
if (cpu_class_is_omap1())
|
||||
break;
|
||||
omap2_mcbsp1_mux_fsr_src(FSR_SRC_FSR);
|
||||
break;
|
||||
case OMAP_MCBSP_FSR_SRC_FSX:
|
||||
if (cpu_class_is_omap1())
|
||||
break;
|
||||
omap2_mcbsp1_mux_fsr_src(FSR_SRC_FSX);
|
||||
break;
|
||||
default:
|
||||
|
|
|
@ -307,6 +307,7 @@ static int __init omap3pandora_soc_init(void)
|
|||
pr_err(PREFIX "Failed to get DAC regulator from %s: %ld\n",
|
||||
dev_name(&omap3pandora_snd_device->dev),
|
||||
PTR_ERR(omap3pandora_dac_reg));
|
||||
ret = PTR_ERR(omap3pandora_dac_reg);
|
||||
goto fail3;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue