diff options
Diffstat (limited to 'sound/pci/als4000.c')
-rw-r--r-- | sound/pci/als4000.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/sound/pci/als4000.c b/sound/pci/als4000.c index 196ec1c61bb4..7c61561f297f 100644 --- a/sound/pci/als4000.c +++ b/sound/pci/als4000.c | |||
@@ -594,8 +594,7 @@ static int __devinit snd_als4000_create_gameport(snd_card_als4000_t *acard, int | |||
594 | acard->gameport = gp = gameport_allocate_port(); | 594 | acard->gameport = gp = gameport_allocate_port(); |
595 | if (!gp) { | 595 | if (!gp) { |
596 | printk(KERN_ERR "als4000: cannot allocate memory for gameport\n"); | 596 | printk(KERN_ERR "als4000: cannot allocate memory for gameport\n"); |
597 | release_resource(r); | 597 | release_and_free_resource(r); |
598 | kfree_nocheck(r); | ||
599 | return -ENOMEM; | 598 | return -ENOMEM; |
600 | } | 599 | } |
601 | 600 | ||
@@ -622,8 +621,7 @@ static void snd_als4000_free_gameport(snd_card_als4000_t *acard) | |||
622 | acard->gameport = NULL; | 621 | acard->gameport = NULL; |
623 | 622 | ||
624 | snd_als4000_set_addr(acard->gcr, 0, 0, 0, 0); /* disable joystick */ | 623 | snd_als4000_set_addr(acard->gcr, 0, 0, 0, 0); /* disable joystick */ |
625 | release_resource(r); | 624 | release_and_free_resource(r); |
626 | kfree_nocheck(r); | ||
627 | } | 625 | } |
628 | } | 626 | } |
629 | #else | 627 | #else |
@@ -669,7 +667,7 @@ static int __devinit snd_card_als4000_probe(struct pci_dev *pci, | |||
669 | /* check, if we can restrict PCI DMA transfers to 24 bits */ | 667 | /* check, if we can restrict PCI DMA transfers to 24 bits */ |
670 | if (pci_set_dma_mask(pci, 0x00ffffff) < 0 || | 668 | if (pci_set_dma_mask(pci, 0x00ffffff) < 0 || |
671 | pci_set_consistent_dma_mask(pci, 0x00ffffff) < 0) { | 669 | pci_set_consistent_dma_mask(pci, 0x00ffffff) < 0) { |
672 | snd_printk("architecture does not support 24bit PCI busmaster DMA\n"); | 670 | snd_printk(KERN_ERR "architecture does not support 24bit PCI busmaster DMA\n"); |
673 | pci_disable_device(pci); | 671 | pci_disable_device(pci); |
674 | return -ENXIO; | 672 | return -ENXIO; |
675 | } | 673 | } |