Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1161012AbWJFOmy (ORCPT ); Fri, 6 Oct 2006 10:42:54 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1161014AbWJFOmy (ORCPT ); Fri, 6 Oct 2006 10:42:54 -0400 Received: from ns2.suse.de ([195.135.220.15]:41364 "EHLO mx2.suse.de") by vger.kernel.org with ESMTP id S1161012AbWJFOmx (ORCPT ); Fri, 6 Oct 2006 10:42:53 -0400 Date: Fri, 06 Oct 2006 16:42:52 +0200 Message-ID: From: Takashi Iwai To: Amol Lad Cc: linux kernel , Andrew Morton Subject: Re: [PATCH 6/9] sound/pci/rme9652/hdsp.c: ioremap balanced with iounmap In-Reply-To: <1160113136.19143.137.camel@amol.verismonetworks.com> References: <1160113136.19143.137.camel@amol.verismonetworks.com> User-Agent: Wanderlust/2.12.0 (Your Wildest Dreams) SEMI/1.14.6 (Maruoka) FLIM/1.14.7 (=?ISO-8859-4?Q?Sanj=F2?=) APEL/10.6 MULE XEmacs/21.5 (beta25) (eggplant) (+CVS-20060326) (i386-suse-linux) MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3361 Lines: 100 At Fri, 06 Oct 2006 11:08:56 +0530, Amol Lad wrote: > > Signed-off-by: Amol Lad This is wrong, too, as well as your patch for hdspm.c... Ditto for rme32.c, rme96.c, and rme9652.c. The fix for au88x0.c seems correct, though. Takashi > --- > hdsp.c | 21 ++++++++++++++++----- > 1 files changed, 16 insertions(+), 5 deletions(-) > --- > diff -uprN -X linux-2.6.19-rc1-orig/Documentation/dontdiff linux-2.6.19-rc1-orig/sound/pci/rme9652/hdsp.c linux-2.6.19-rc1/sound/pci/rme9652/hdsp.c > --- linux-2.6.19-rc1-orig/sound/pci/rme9652/hdsp.c 2006-10-05 14:01:05.000000000 +0530 > +++ linux-2.6.19-rc1/sound/pci/rme9652/hdsp.c 2006-10-05 16:54:38.000000000 +0530 > @@ -4936,6 +4936,7 @@ static int __devinit snd_hdsp_create(str > > if (request_irq(pci->irq, snd_hdsp_interrupt, IRQF_DISABLED|IRQF_SHARED, "hdsp", (void *)hdsp)) { > snd_printk(KERN_ERR "Hammerfall-DSP: unable to use IRQ %d\n", pci->irq); > + iounmap(hdsp->iobase); > return -EBUSY; > } > > @@ -4943,8 +4944,10 @@ static int __devinit snd_hdsp_create(str > hdsp->precise_ptr = 1; > hdsp->use_midi_tasklet = 1; > > - if ((err = snd_hdsp_initialize_memory(hdsp)) < 0) > + if ((err = snd_hdsp_initialize_memory(hdsp)) < 0) { > + iounmap(hdsp->iobase); > return err; > + } > > if (!is_9652 && !is_9632) { > /* we wait 2 seconds to let freshly inserted cardbus cards do their hardware init */ > @@ -4964,8 +4967,10 @@ static int __devinit snd_hdsp_create(str > #endif > /* no iobox connected, we defer initialization */ > snd_printk(KERN_INFO "Hammerfall-DSP: card initialization pending : waiting for firmware\n"); > - if ((err = snd_hdsp_create_hwdep(card, hdsp)) < 0) > + if ((err = snd_hdsp_create_hwdep(card, hdsp)) < 0) { > + iounmap(hdsp->iobase); > return err; > + } > return 0; > } else { > snd_printk(KERN_INFO "Hammerfall-DSP: Firmware already present, initializing card.\n"); > @@ -4976,8 +4981,10 @@ static int __devinit snd_hdsp_create(str > } > } > > - if ((err = snd_hdsp_enable_io(hdsp)) != 0) > + if ((err = snd_hdsp_enable_io(hdsp)) != 0) { > + iounmap(hdsp->iobase); > return err; > + } > > if (is_9652) > hdsp->io_type = H9652; > @@ -4985,16 +4992,20 @@ static int __devinit snd_hdsp_create(str > if (is_9632) > hdsp->io_type = H9632; > > - if ((err = snd_hdsp_create_hwdep(card, hdsp)) < 0) > + if ((err = snd_hdsp_create_hwdep(card, hdsp)) < 0) { > + iounmap(hdsp->iobase); > return err; > + } > > snd_hdsp_initialize_channels(hdsp); > snd_hdsp_initialize_midi_flush(hdsp); > > hdsp->state |= HDSP_FirmwareLoaded; > > - if ((err = snd_hdsp_create_alsa_devices(card, hdsp)) < 0) > + if ((err = snd_hdsp_create_alsa_devices(card, hdsp)) < 0) { > + iounmap(hdsp->iobase); > return err; > + } > > return 0; > } > > > - > 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/ > - 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/