From 35098755c90373eb932f02f71ec986e9d4a6f49b Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Sat, 16 Dec 2006 17:05:07 -0200 Subject: Backported several changes from kernel 2.6.19-git series From: Mauro Carvalho Chehab 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 --- linux/sound/oss/btaudio.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'linux/sound/oss') 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) { -- cgit v1.2.3