diff options
Diffstat (limited to 'sound/pci/mixart/mixart.c')
-rw-r--r-- | sound/pci/mixart/mixart.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/pci/mixart/mixart.c b/sound/pci/mixart/mixart.c index bfc19e36c4b6..82bc5b9e7629 100644 --- a/sound/pci/mixart/mixart.c +++ b/sound/pci/mixart/mixart.c | |||
@@ -607,6 +607,7 @@ static int snd_mixart_hw_params(struct snd_pcm_substream *subs, | |||
607 | /* set the format to the board */ | 607 | /* set the format to the board */ |
608 | err = mixart_set_format(stream, format); | 608 | err = mixart_set_format(stream, format); |
609 | if(err < 0) { | 609 | if(err < 0) { |
610 | mutex_unlock(&mgr->setup_mutex); | ||
610 | return err; | 611 | return err; |
611 | } | 612 | } |
612 | 613 | ||
@@ -1290,7 +1291,7 @@ static int __devinit snd_mixart_probe(struct pci_dev *pci, | |||
1290 | pci_set_master(pci); | 1291 | pci_set_master(pci); |
1291 | 1292 | ||
1292 | /* check if we can restrict PCI DMA transfers to 32 bits */ | 1293 | /* check if we can restrict PCI DMA transfers to 32 bits */ |
1293 | if (pci_set_dma_mask(pci, DMA_32BIT_MASK) < 0) { | 1294 | if (pci_set_dma_mask(pci, DMA_BIT_MASK(32)) < 0) { |
1294 | snd_printk(KERN_ERR "architecture does not support 32bit PCI busmaster DMA\n"); | 1295 | snd_printk(KERN_ERR "architecture does not support 32bit PCI busmaster DMA\n"); |
1295 | pci_disable_device(pci); | 1296 | pci_disable_device(pci); |
1296 | return -ENXIO; | 1297 | return -ENXIO; |