diff options
Diffstat (limited to 'sound/oss')
-rw-r--r-- | sound/oss/trident.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sound/oss/trident.c b/sound/oss/trident.c index 3e408f491927..2e3e78e1bf67 100644 --- a/sound/oss/trident.c +++ b/sound/oss/trident.c | |||
@@ -2702,6 +2702,7 @@ trident_open(struct inode *inode, struct file *file) | |||
2702 | struct trident_card *card = devs; | 2702 | struct trident_card *card = devs; |
2703 | struct trident_state *state = NULL; | 2703 | struct trident_state *state = NULL; |
2704 | struct dmabuf *dmabuf = NULL; | 2704 | struct dmabuf *dmabuf = NULL; |
2705 | unsigned long flags; | ||
2705 | 2706 | ||
2706 | /* Added by Matt Wu 01-05-2001 */ | 2707 | /* Added by Matt Wu 01-05-2001 */ |
2707 | /* TODO: there's some redundacy here wrt the check below */ | 2708 | /* TODO: there's some redundacy here wrt the check below */ |
@@ -2779,7 +2780,9 @@ trident_open(struct inode *inode, struct file *file) | |||
2779 | /* set default channel attribute to normal playback */ | 2780 | /* set default channel attribute to normal playback */ |
2780 | dmabuf->channel->attribute = CHANNEL_PB; | 2781 | dmabuf->channel->attribute = CHANNEL_PB; |
2781 | } | 2782 | } |
2783 | spin_lock_irqsave(&card->lock, flags); | ||
2782 | trident_set_dac_rate(state, 8000); | 2784 | trident_set_dac_rate(state, 8000); |
2785 | spin_unlock_irqrestore(&card->lock, flags); | ||
2783 | } | 2786 | } |
2784 | 2787 | ||
2785 | if (file->f_mode & FMODE_READ) { | 2788 | if (file->f_mode & FMODE_READ) { |
@@ -2797,7 +2800,9 @@ trident_open(struct inode *inode, struct file *file) | |||
2797 | dmabuf->channel->attribute = (CHANNEL_REC | PCM_LR | | 2800 | dmabuf->channel->attribute = (CHANNEL_REC | PCM_LR | |
2798 | MONO_MIX); | 2801 | MONO_MIX); |
2799 | } | 2802 | } |
2803 | spin_lock_irqsave(&card->lock, flags); | ||
2800 | trident_set_adc_rate(state, 8000); | 2804 | trident_set_adc_rate(state, 8000); |
2805 | spin_unlock_irqrestore(&card->lock, flags); | ||
2801 | 2806 | ||
2802 | /* Added by Matt Wu 01-05-2001 */ | 2807 | /* Added by Matt Wu 01-05-2001 */ |
2803 | if (card->pci_id == PCI_DEVICE_ID_ALI_5451) | 2808 | if (card->pci_id == PCI_DEVICE_ID_ALI_5451) |