From: Amol Lad <amol@verismonetworks.com>
To: Andrew Morton <akpm@osdl.org>
Cc: linux kernel <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH 3/9] sound/oss/msnd_pinnacle.c: ioremap balanced with iounmap
Date: Sat, 07 Oct 2006 10:39:37 +0530 [thread overview]
Message-ID: <1160197777.19143.157.camel@amol.verismonetworks.com> (raw)
In-Reply-To: <20061006160324.142ccebf.akpm@osdl.org>
On Fri, 2006-10-06 at 16:03 -0700, Andrew Morton wrote:
> On Fri, 06 Oct 2006 11:08:57 +0530
> Amol Lad <amol@verismonetworks.com> wrote:
>
> > msnd_pinnacle.c | 10 ++++++++++
>
> This driver fails to check that ioremap() actually succeeded. Hence with
> this patch we can end up doing iounmap(NULL).
>
Is this better ?
Signed-off-by: Amol Lad <amol@verismonetworks.com>
---
msnd_pinnacle.c | 30 +++++++++++++++++++++---------
1 files changed, 21 insertions(+), 9 deletions(-)
---
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-07 10:28:31.000000000 +0530
@@ -1441,6 +1441,10 @@ static int __init attach_multisound(void
static void __exit unload_multisound(void)
{
+ if (dev.base) {
+ iounmap(dev.base);
+ dev.base = NULL;
+ }
release_region(dev.io, dev.numio);
free_irq(dev.irq, &dev);
unregister_sound_mixer(dev.mixer_minor);
@@ -1884,30 +1888,38 @@ 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");
- return err;
+ goto fail1;
}
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);
- return err;
+ goto fail2;
}
if ((err = probe_multisound()) < 0) {
printk(KERN_ERR LOGNAME ": Probe failed\n");
- msnd_fifo_free(&dev.DAPF);
- msnd_fifo_free(&dev.DARF);
- return err;
+ goto fail3;
}
if ((err = attach_multisound()) < 0) {
printk(KERN_ERR LOGNAME ": Attach failed\n");
- msnd_fifo_free(&dev.DAPF);
- msnd_fifo_free(&dev.DARF);
- return err;
+ goto fail3;
}
return 0;
+
+fail3:
+ msnd_fifo_free(&dev.DARF);
+fail2:
+ msnd_fifo_free(&dev.DAPF);
+fail1:
+ if (dev.base) {
+ iounmap(dev.base);
+ dev.base = NULL;
+ }
+
+ return err;
+
}
static void __exit msdn_cleanup(void)
prev parent reply other threads:[~2006-10-07 5:06 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-10-06 5:38 Amol Lad
2006-10-06 23:03 ` Andrew Morton
2006-10-07 5:09 ` Amol Lad [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1160197777.19143.157.camel@amol.verismonetworks.com \
--to=amol@verismonetworks.com \
--cc=akpm@osdl.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®