The patch titled
ALSA: cs5535audio: correctly set dma->substream
has been added to the -mm tree. Its filename is
alsa-cs5535audio-correctly-set-dma-substream.patch
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: ALSA: cs5535audio: correctly set dma->substream
From: Andres Salomon <dilinger@xxxxxxxxxx>
We're never actually setting dma->substream to the current substream; that
means the dma->substream checks that we do in the suspend/resume path are
never satisfied, and the PRD registers are never correctly managed. This
changes it so that we set the substream when constructing the specific bus
master DMA, and unsetting it when we tear down the BM's DMA.
Signed-off-by: Andres Salomon <dilinger@xxxxxxxxxx>
Acked-by: Jordan Crouse <jordan.crouse@xxxxxxx>
Acked-by: Jaya Kumar <jayakumar.alsa@xxxxxxxxx>
Cc: Jaroslav Kysela <perex@xxxxxxx>
Cc: Takashi Iwai <tiwai@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
sound/pci/cs5535audio/cs5535audio_pcm.c | 2 ++
1 files changed, 2 insertions(+)
diff -puN sound/pci/cs5535audio/cs5535audio_pcm.c~alsa-cs5535audio-correctly-set-dma-substream sound/pci/cs5535audio/cs5535audio_pcm.c
--- a/sound/pci/cs5535audio/cs5535audio_pcm.c~alsa-cs5535audio-correctly-set-dma-substream
+++ a/sound/pci/cs5535audio/cs5535audio_pcm.c
@@ -161,6 +161,7 @@ static int cs5535audio_build_dma_packets
jmpprd_addr = cpu_to_le32(lastdesc->addr +
(sizeof(struct cs5535audio_dma_desc)*periods));
+ dma->substream = substream;
dma->period_bytes = period_bytes;
dma->periods = periods;
spin_lock_irq(&cs5535au->reg_lock);
@@ -238,6 +239,7 @@ static void cs5535audio_clear_dma_packet
{
snd_dma_free_pages(&dma->desc_buf);
dma->desc_buf.area = NULL;
+ dma->substream = NULL;
}
static int snd_cs5535audio_hw_params(struct snd_pcm_substream *substream,
_
Patches currently in -mm which might be from dilinger@xxxxxxxxxx are
alsa-cs5535audio-correctly-set-dma-substream.patch
alsa-cs5535audio-fix-prd-register-save-restore-power-management-race.patch
alsa-cs5535audio-update-pci-device-handling-in-suspend-resume.patch
alsa-cs5535audio-fix-acc_bm_cmd-register-handling.patch
alsa-cs5535audio-drop-unused-bus-master-stuff.patch
geode-mfgpt-support-for-geode-class-machines.patch
geode-mfgpt-clock-event-device-support.patch
serial-turn-serial-console-suspend-a-boot-rather-than-compile-time-option-update.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
