diff options
| author |   Takashi Iwai <tiwai@suse.de> | 2011-09-27 18:21:41 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-09-27 18:21:41 +0200 |
| commit | 0fac25908f8e26a27d869f0aa4fad04c3db60dc7 (patch) | |
| tree | 226be2faebf7fad80ef2eb44edca9b0c18eed511 /sound | |
| parent | ALSA: usb-audio: Check for possible chip NULL pointer before clearing probing flag (diff) | |
| parent | ASoC: ssm2602: Re-enable oscillator after suspend (diff) | |
| download | linux-dev-0fac25908f8e26a27d869f0aa4fad04c3db60dc7.tar.xz linux-dev-0fac25908f8e26a27d869f0aa4fad04c3db60dc7.zip | |
Merge branch 'fix/asoc' into for-linus
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/codecs/ssm2602.c | 3 | ||||
| -rw-r--r-- | sound/soc/omap/omap-mcbsp.c | 6 |
2 files changed, 8 insertions, 1 deletions
diff --git a/sound/soc/codecs/ssm2602.c b/sound/soc/codecs/ssm2602.c index 84f4ad568556..9801cd7cfcb5 100644 --- a/sound/soc/codecs/ssm2602.c +++ b/sound/soc/codecs/ssm2602.c @@ -431,7 +431,8 @@ static int ssm2602_set_dai_fmt(struct snd_soc_dai *codec_dai, static int ssm2602_set_bias_level(struct snd_soc_codec *codec, enum snd_soc_bias_level level) { - u16 reg = snd_soc_read(codec, SSM2602_PWR) & 0xff7f; + u16 reg = snd_soc_read(codec, SSM2602_PWR); + reg &= ~(PWR_POWER_OFF | PWR_OSC_PDN); switch (level) { case SND_SOC_BIAS_ON: diff --git a/sound/soc/omap/omap-mcbsp.c b/sound/soc/omap/omap-mcbsp.c index ebcc2d4d2b18..478d60778453 100644 --- a/sound/soc/omap/omap-mcbsp.c +++ b/sound/soc/omap/omap-mcbsp.c @@ -516,6 +516,12 @@ static int omap_mcbsp_dai_set_dai_sysclk(struct snd_soc_dai *cpu_dai, struct omap_mcbsp_reg_cfg *regs = &mcbsp_data->regs; int err = 0; + if (mcbsp_data->active) + if (freq == mcbsp_data->in_freq) + return 0; + else + return -EBUSY; + /* The McBSP signal muxing functions are only available on McBSP1 */ if (clk_id == OMAP_MCBSP_CLKR_SRC_CLKR || clk_id == OMAP_MCBSP_CLKR_SRC_CLKX || |