Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932211AbWJFFhE (ORCPT ); Fri, 6 Oct 2006 01:37:04 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751372AbWJFFf4 (ORCPT ); Fri, 6 Oct 2006 01:35:56 -0400 Received: from mail01.verismonetworks.com ([164.164.99.228]:18358 "EHLO mail01.verismonetworks.com") by vger.kernel.org with ESMTP id S932201AbWJFFfh (ORCPT ); Fri, 6 Oct 2006 01:35:37 -0400 Subject: [PATCH 3/9] sound/oss/msnd_pinnacle.c: ioremap balanced with iounmap From: Amol Lad To: linux kernel Cc: Andrew Morton Content-Type: text/plain Date: Fri, 06 Oct 2006 11:08:57 +0530 Message-Id: <1160113137.19143.140.camel@amol.verismonetworks.com> Mime-Version: 1.0 X-Mailer: Evolution 2.2.1 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1949 Lines: 59 Signed-off-by: Amol Lad --- msnd_pinnacle.c | 10 ++++++++++ 1 files changed, 10 insertions(+) --- diff -uprN -X linux-2.6.19-rc1-orig/Documentation/dontdiff linux-2.6.19-rc1-orig/sound/oss/msnd_pinnacle.c linux-2.6.19-rc1/sound/oss/msnd_pinnacle.c --- linux-2.6.19-rc1-orig/sound/oss/msnd_pinnacle.c 2006-09-21 10:15:52.000000000 +0530 +++ linux-2.6.19-rc1/sound/oss/msnd_pinnacle.c 2006-10-05 17:23:26.000000000 +0530 @@ -1441,6 +1441,8 @@ static int __init attach_multisound(void static void __exit unload_multisound(void) { + iounmap(dev.base); + dev.base = NULL; release_region(dev.io, dev.numio); free_irq(dev.irq, &dev); unregister_sound_mixer(dev.mixer_minor); @@ -1884,12 +1886,16 @@ static int __init msnd_init(void) printk(KERN_INFO LOGNAME ": %u byte audio FIFOs (x2)\n", dev.fifosize); if ((err = msnd_fifo_alloc(&dev.DAPF, dev.fifosize)) < 0) { printk(KERN_ERR LOGNAME ": Couldn't allocate write FIFO\n"); + iounmap(dev.base); + dev.base = NULL; return err; } if ((err = msnd_fifo_alloc(&dev.DARF, dev.fifosize)) < 0) { printk(KERN_ERR LOGNAME ": Couldn't allocate read FIFO\n"); msnd_fifo_free(&dev.DAPF); + iounmap(dev.base); + dev.base = NULL; return err; } @@ -1897,6 +1903,8 @@ static int __init msnd_init(void) printk(KERN_ERR LOGNAME ": Probe failed\n"); msnd_fifo_free(&dev.DAPF); msnd_fifo_free(&dev.DARF); + iounmap(dev.base); + dev.base = NULL; return err; } @@ -1904,6 +1912,8 @@ static int __init msnd_init(void) printk(KERN_ERR LOGNAME ": Attach failed\n"); msnd_fifo_free(&dev.DAPF); msnd_fifo_free(&dev.DARF); + iounmap(dev.base); + dev.base = NULL; return err; } - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/