summaryrefslogtreecommitdiff
path: root/sound/isa
diff options
context:
space:
mode:
authorOndrej Zary <linux@rainbow-software.org>2012-07-12 23:30:31 +0200
committerTakashi Iwai <tiwai@suse.de>2012-07-16 11:23:45 +0200
commitca3273fb594ae4e953042c956eb40141ba46ad2c (patch)
treee0c132d4968beb23cdf8ec25e3783e009676684d /sound/isa
parent093eef416642c84265cced12335ff125f0db7313 (diff)
downloadlinux-3.10-ca3273fb594ae4e953042c956eb40141ba46ad2c.tar.gz
linux-3.10-ca3273fb594ae4e953042c956eb40141ba46ad2c.tar.bz2
linux-3.10-ca3273fb594ae4e953042c956eb40141ba46ad2c.zip
ALSA: wss_lib: fix suspend/resume
By setting SNDRV_PCM_INFO_RESUME, wss_lib claims that it can restore the card state fully on resume. But in fact, it can't as DMA is not restored so any playback/capture running during suspend will fail to continue after resume. Remove SNDRV_PCM_INFO_RESUME flag from pcm info field to fix the problem. Signed-off-by: Ondrej Zary <linux@rainbow-software.org> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/isa')
-rw-r--r--sound/isa/wss/wss_lib.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/isa/wss/wss_lib.c b/sound/isa/wss/wss_lib.c
index 49c8a0c2442..00ca9fc4de0 100644
--- a/sound/isa/wss/wss_lib.c
+++ b/sound/isa/wss/wss_lib.c
@@ -1456,7 +1456,6 @@ static struct snd_pcm_hardware snd_wss_playback =
{
.info = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
SNDRV_PCM_INFO_MMAP_VALID |
- SNDRV_PCM_INFO_RESUME |
SNDRV_PCM_INFO_SYNC_START),
.formats = (SNDRV_PCM_FMTBIT_MU_LAW | SNDRV_PCM_FMTBIT_A_LAW | SNDRV_PCM_FMTBIT_IMA_ADPCM |
SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S16_BE),