summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorAlan Tull <r80115@freescale.com>2012-01-17 08:34:44 -0600
committerJason Liu <r64343@freescale.com>2012-01-19 12:41:33 +0800
commit97d08a7e9a3972ba68c8ad0792d63aa4133396db (patch)
tree3e27a2ae50f52c457f2ec624fee95c1a6a662693 /sound
parent9026b185a69e2c25bdbd904234e3301cc073418d (diff)
ENGR00172008 HDMI audio continues playing after doing ctrl-z
The bug is that HDMI audio continues playing after doing ctrl-z, repeating playing a small part of the buffer. Mask HDMI audio irq when we receive SNDRV_PCM_TRIGGER_STOP command. Unmask when we receive SNDRV_PCM_TRIGGER_START. Signed-off-by: Alan Tull <r80115@freescale.com>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/imx/imx-hdmi-dma.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/sound/soc/imx/imx-hdmi-dma.c b/sound/soc/imx/imx-hdmi-dma.c
index 1c875a2e058d..34a64d6072d6 100644
--- a/sound/soc/imx/imx-hdmi-dma.c
+++ b/sound/soc/imx/imx-hdmi-dma.c
@@ -1,7 +1,7 @@
/*
* imx-hdmi-dma.c -- HDMI DMA driver for ALSA Soc Audio Layer
*
- * Copyright (C) 2011 Freescale Semiconductor, Inc.
+ * Copyright (C) 2011-2012 Freescale Semiconductor, Inc.
*
* based on imx-pcm-dma-mx2.c
* Copyright 2009 Sascha Hauer <s.hauer@pengutronix.de>
@@ -540,6 +540,7 @@ static int hdmi_dma_trigger(struct snd_pcm_substream *substream, int cmd)
case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
rtd->frame_idx = 0;
dumpregs();
+ hdmi_dma_irq_mask(0);
hdmi_dma_start();
break;
@@ -547,6 +548,7 @@ static int hdmi_dma_trigger(struct snd_pcm_substream *substream, int cmd)
case SNDRV_PCM_TRIGGER_SUSPEND:
case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
hdmi_dma_stop();
+ hdmi_dma_irq_mask(1);
break;
default: