diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-11-24 11:57:43 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-11-24 11:57:43 +0000 |
| commit | ab4e57446ff2e0a5c154cb703595d574130dc919 (patch) | |
| tree | 2527773606a07b3f7af0bd2c0e6f692d1f340d32 /sound/soc/omap | |
| parent | 2a9ae13a2641373d06e24f866c7427644c39bfea (diff) | |
| parent | d6f443ae4c1d54379ad5953d7bcb89a63387184d (diff) | |
| download | blackbird-op-linux-ab4e57446ff2e0a5c154cb703595d574130dc919.tar.gz blackbird-op-linux-ab4e57446ff2e0a5c154cb703595d574130dc919.zip | |
Merge branch 'for-2.6.37' into for-2.6.38
Diffstat (limited to 'sound/soc/omap')
| -rw-r--r-- | sound/soc/omap/omap-mcbsp.c | 8 | ||||
| -rw-r--r-- | sound/soc/omap/omap3pandora.c | 1 |
2 files changed, 9 insertions, 0 deletions
diff --git a/sound/soc/omap/omap-mcbsp.c b/sound/soc/omap/omap-mcbsp.c index d211c9fa5a91..7e84f24b9a88 100644 --- a/sound/soc/omap/omap-mcbsp.c +++ b/sound/soc/omap/omap-mcbsp.c @@ -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: diff --git a/sound/soc/omap/omap3pandora.c b/sound/soc/omap/omap3pandora.c index bff9864e7615..8047c521e318 100644 --- a/sound/soc/omap/omap3pandora.c +++ b/sound/soc/omap/omap3pandora.c @@ -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; } |
