diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-12-16 17:05:07 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-12-16 17:05:07 -0200 |
| commit | 35098755c90373eb932f02f71ec986e9d4a6f49b (patch) | |
| tree | c5e3b04ce2663b1a3184d7b155d04a2a420c2643 /linux/sound/oss | |
| parent | b6893c1c0a9345aa661d24496e494400283c2c46 (diff) | |
| download | mediapointer-dvb-s2-35098755c90373eb932f02f71ec986e9d4a6f49b.tar.gz mediapointer-dvb-s2-35098755c90373eb932f02f71ec986e9d4a6f49b.tar.bz2 | |
Backported several changes from kernel 2.6.19-git series
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Main changes:
- There were several checks for usb release routines that were removed, since
the routine itself checks for null values:
usb_free_urb, usb_kill_urb, usb_unlink_urb
Should be checked if this really happens on older kernels.
- updated sound/oss/btaudio.c
- replaced SLAB_ATOMIC to GFP_ATOMIC
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/sound/oss')
| -rw-r--r-- | linux/sound/oss/btaudio.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/linux/sound/oss/btaudio.c b/linux/sound/oss/btaudio.c index 82aeb950d..c0231bcc9 100644 --- a/linux/sound/oss/btaudio.c +++ b/linux/sound/oss/btaudio.c @@ -1033,6 +1033,7 @@ static int __devinit btaudio_probe(struct pci_dev *pci_dev, fail2: free_irq(bta->irq,bta); fail1: + iounmap(bta->mmio); kfree(bta); fail0: release_mem_region(pci_resource_start(pci_dev,0), @@ -1064,6 +1065,7 @@ static void __devexit btaudio_remove(struct pci_dev *pci_dev) free_irq(bta->irq,bta); release_mem_region(pci_resource_start(pci_dev,0), pci_resource_len(pci_dev,0)); + iounmap(bta->mmio); /* remove from linked list */ if (bta == btaudios) { |