diff options
| author | Dan Murphy <dmurphy@ti.com> | 2011-12-14 11:33:19 -0600 |
|---|---|---|
| committer | Dan Murphy <dmurphy@ti.com> | 2011-12-14 11:33:19 -0600 |
| commit | f2d84a9b89eb927d3b0b868a2ca83941273f28f0 (patch) | |
| tree | 42067d2c8eaec9b826d9e9f02892c0321ffa36f0 /sound/soc/omap | |
| parent | f9ac7a7be4e193c56cfd6f9653bd34e00cb98aa4 (diff) | |
| parent | 070b34dd5d0a75ff1f1dc538f91990df1b63269a (diff) | |
| download | kernel_samsung_espresso10-f2d84a9b89eb927d3b0b868a2ca83941273f28f0.zip kernel_samsung_espresso10-f2d84a9b89eb927d3b0b868a2ca83941273f28f0.tar.gz kernel_samsung_espresso10-f2d84a9b89eb927d3b0b868a2ca83941273f28f0.tar.bz2 | |
Merge branch 'android-omap-3.0' into p-android-omap-3.0
Conflicts:
arch/arm/mach-omap2/pm44xx.c
arch/arm/mach-omap2/smartreflex-class1p5.c
arch/arm/mach-omap2/smartreflex.h
arch/arm/mach-omap2/voltage.h
drivers/remoteproc/remoteproc.c
drivers/rpmsg/rpmsg_resmgr.c
include/video/dsscomp.h
Change-Id: I516310bbf02d4e6fc0d980e1755b2b35dfbc7ed4
Signed-off-by: Dan Murphy <dmurphy@ti.com>
Diffstat (limited to 'sound/soc/omap')
| -rw-r--r-- | sound/soc/omap/omap-mcpdm.c | 2 | ||||
| -rw-r--r-- | sound/soc/omap/omap-pcm.c | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/sound/soc/omap/omap-mcpdm.c b/sound/soc/omap/omap-mcpdm.c index 45328d4..62f23b2 100644 --- a/sound/soc/omap/omap-mcpdm.c +++ b/sound/soc/omap/omap-mcpdm.c @@ -399,7 +399,9 @@ static int omap_mcpdm_dai_startup(struct snd_pcm_substream *substream, val = __raw_readl(OMAP4430_CM1_ABE_PDM_CLKCTRL); if ((val & CLKCTRL_MODULEMODE_MASK) != CLKCTRL_MODULEMODE_ENABLED) { WARN(1, "Clock not enabled: PDM_CLKCTRL=0x%x\n", val); + mcpdm->active--; pm_runtime_put_sync(mcpdm->dev); + err = -ENODEV; goto out; } diff --git a/sound/soc/omap/omap-pcm.c b/sound/soc/omap/omap-pcm.c index 6a36196..a2a464f 100644 --- a/sound/soc/omap/omap-pcm.c +++ b/sound/soc/omap/omap-pcm.c @@ -391,7 +391,6 @@ static void omap_pcm_free_dma_buffers(struct snd_pcm *pcm) static int omap_pcm_new(struct snd_soc_pcm_runtime *rtd) { struct snd_card *card = rtd->card->snd_card; - struct snd_soc_dai *dai = rtd->cpu_dai; struct snd_pcm *pcm = rtd->pcm; int ret = 0; @@ -400,14 +399,14 @@ static int omap_pcm_new(struct snd_soc_pcm_runtime *rtd) if (!card->dev->coherent_dma_mask) card->dev->coherent_dma_mask = DMA_BIT_MASK(64); - if (dai->driver->playback.channels_min) { + if (pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream) { ret = omap_pcm_preallocate_dma_buffer(pcm, SNDRV_PCM_STREAM_PLAYBACK); if (ret) goto out; } - if (dai->driver->capture.channels_min) { + if (pcm->streams[SNDRV_PCM_STREAM_CAPTURE].substream) { ret = omap_pcm_preallocate_dma_buffer(pcm, SNDRV_PCM_STREAM_CAPTURE); if (ret) |