diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-09-05 05:16:50 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-09-05 05:16:50 -0400 |
| commit | 586a4ac509b041df55f26c2b26cd7cbdaf9b045d (patch) | |
| tree | dd91fe472070836465da7901f22869b54b2999b8 /sound/pci/au88x0/au88x0_pcm.c | |
| parent | 374b1873571bf80dc0c1fcceaaad067980f3b9de (diff) | |
| parent | 6b39374a27eb4be7e9d82145ae270ba02ea90dc8 (diff) | |
/spare/repo/libata-dev branch 'master'
Diffstat (limited to 'sound/pci/au88x0/au88x0_pcm.c')
| -rw-r--r-- | sound/pci/au88x0/au88x0_pcm.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sound/pci/au88x0/au88x0_pcm.c b/sound/pci/au88x0/au88x0_pcm.c index 04dcefd8b8ff..38bd2b5dd434 100644 --- a/sound/pci/au88x0/au88x0_pcm.c +++ b/sound/pci/au88x0/au88x0_pcm.c | |||
| @@ -33,7 +33,7 @@ | |||
| 33 | /* hardware definition */ | 33 | /* hardware definition */ |
| 34 | static snd_pcm_hardware_t snd_vortex_playback_hw_adb = { | 34 | static snd_pcm_hardware_t snd_vortex_playback_hw_adb = { |
| 35 | .info = | 35 | .info = |
| 36 | (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_RESUME | | 36 | (SNDRV_PCM_INFO_MMAP | /* SNDRV_PCM_INFO_RESUME | */ |
| 37 | SNDRV_PCM_INFO_PAUSE | SNDRV_PCM_INFO_INTERLEAVED | | 37 | SNDRV_PCM_INFO_PAUSE | SNDRV_PCM_INFO_INTERLEAVED | |
| 38 | SNDRV_PCM_INFO_MMAP_VALID), | 38 | SNDRV_PCM_INFO_MMAP_VALID), |
| 39 | .formats = | 39 | .formats = |
| @@ -58,7 +58,7 @@ static snd_pcm_hardware_t snd_vortex_playback_hw_adb = { | |||
| 58 | #ifndef CHIP_AU8820 | 58 | #ifndef CHIP_AU8820 |
| 59 | static snd_pcm_hardware_t snd_vortex_playback_hw_a3d = { | 59 | static snd_pcm_hardware_t snd_vortex_playback_hw_a3d = { |
| 60 | .info = | 60 | .info = |
| 61 | (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_RESUME | | 61 | (SNDRV_PCM_INFO_MMAP | /* SNDRV_PCM_INFO_RESUME | */ |
| 62 | SNDRV_PCM_INFO_PAUSE | SNDRV_PCM_INFO_INTERLEAVED | | 62 | SNDRV_PCM_INFO_PAUSE | SNDRV_PCM_INFO_INTERLEAVED | |
| 63 | SNDRV_PCM_INFO_MMAP_VALID), | 63 | SNDRV_PCM_INFO_MMAP_VALID), |
| 64 | .formats = | 64 | .formats = |
| @@ -78,7 +78,7 @@ static snd_pcm_hardware_t snd_vortex_playback_hw_a3d = { | |||
| 78 | #endif | 78 | #endif |
| 79 | static snd_pcm_hardware_t snd_vortex_playback_hw_spdif = { | 79 | static snd_pcm_hardware_t snd_vortex_playback_hw_spdif = { |
| 80 | .info = | 80 | .info = |
| 81 | (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_RESUME | | 81 | (SNDRV_PCM_INFO_MMAP | /* SNDRV_PCM_INFO_RESUME | */ |
| 82 | SNDRV_PCM_INFO_PAUSE | SNDRV_PCM_INFO_INTERLEAVED | | 82 | SNDRV_PCM_INFO_PAUSE | SNDRV_PCM_INFO_INTERLEAVED | |
| 83 | SNDRV_PCM_INFO_MMAP_VALID), | 83 | SNDRV_PCM_INFO_MMAP_VALID), |
| 84 | .formats = | 84 | .formats = |
| @@ -220,8 +220,10 @@ snd_vortex_pcm_hw_params(snd_pcm_substream_t * substream, | |||
| 220 | vortex_adb_allocroute(chip, -1, | 220 | vortex_adb_allocroute(chip, -1, |
| 221 | params_channels(hw_params), | 221 | params_channels(hw_params), |
| 222 | substream->stream, type); | 222 | substream->stream, type); |
| 223 | if (dma < 0) | 223 | if (dma < 0) { |
| 224 | spin_unlock_irq(&chip->lock); | ||
| 224 | return dma; | 225 | return dma; |
| 226 | } | ||
| 225 | stream = substream->runtime->private_data = &chip->dma_adb[dma]; | 227 | stream = substream->runtime->private_data = &chip->dma_adb[dma]; |
| 226 | stream->substream = substream; | 228 | stream->substream = substream; |
| 227 | /* Setup Buffers. */ | 229 | /* Setup Buffers. */ |