DL-Mirrors/kernel-tenderloin-3.0
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "ASOC: msm8960: Reset irq pointer if trigger start done." into msm-3.0

Browse Source
This commit is contained in:
Linux Build Service Account
2011-10-20 22:35:31 -07:00
committed by QuIC Gerrit Code Review
parent ede570c880 a4a4baa347
commit af2ac1e9be
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sound/soc/msm/msm-pcm-lpa.c
View File

@@ -79,9 +79,11 @@ static void event_handler(uint32_t opcode,
struct snd_pcm_runtime *runtime = substream->runtime;
struct audio_aio_write_param param;
struct audio_buffer *buf = prtd->audio_client->port[IN].buf;
unsigned long flag = 0;
int i = 0;
pr_debug("%s\n", __func__);
spin_lock_irqsave(&the_locks.event_lock, flag);
switch (opcode) {
case ASM_DATA_EVENT_WRITE_DONE: {
uint32_t *ptrmem = (uint32_t *)&param;
@@ -163,6 +165,7 @@ static void event_handler(uint32_t opcode,
pr_debug("Not Supported Event opcode[0x%x]\n", opcode);
break;
}
spin_unlock_irqrestore(&the_locks.event_lock, flag);
}
static int msm_pcm_playback_prepare(struct snd_pcm_substream *substream)
@@ -201,6 +204,7 @@ static int msm_pcm_trigger(struct snd_pcm_substream *substream, int cmd)
pr_debug("%s\n", __func__);
switch (cmd) {
case SNDRV_PCM_TRIGGER_START:
prtd->pcm_irq_pos = 0;
case SNDRV_PCM_TRIGGER_RESUME:
case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
pr_debug("SNDRV_PCM_TRIGGER_START\n");
@@ -511,6 +515,7 @@ static struct platform_driver msm_pcm_driver = {
static int __init msm_soc_platform_init(void)
{
spin_lock_init(&the_locks.event_lock);
init_waitqueue_head(&the_locks.enable_wait);
init_waitqueue_head(&the_locks.eos_wait);
init_waitqueue_head(&the_locks.write_wait);

1
sound/soc/msm/msm-pcm-q6.h
View File

@@ -43,6 +43,7 @@ struct buffer_rec {
};
struct audio_locks {
spinlock_t event_lock;
wait_queue_head_t read_wait;
wait_queue_head_t write_wait;
wait_queue_head_t eos_wait;