[PATCH 10/15] sunxvr500: fix cmap memory leaks

[PATCH 10/15] sunxvr500: fix cmap memory leaks

[Andres Salomon]

 - fix cmap leak in removal path
 - fix cmap leak when register_framebuffer fails

Signed-off-by: Andres Salomon <dilinger@debian.org>
---
 drivers/video/sunxvr500.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/drivers/video/sunxvr500.c b/drivers/video/sunxvr500.c
index c2ba51b..18b9507 100644
--- a/drivers/video/sunxvr500.c
+++ b/drivers/video/sunxvr500.c
@@ -349,11 +349,14 @@ static int __devinit e3d_pci_register(struct pci_dev *pdev,
 	if (err < 0) {
 		printk(KERN_ERR "e3d: Could not register framebuffer %s\n",
 		       pci_name(pdev));
-		goto err_unmap_fb;
+		goto err_free_cmap;
 	}
 
 	return 0;
 
+err_free_cmap:
+	fb_dealloc_cmap(&info->cmap);
+
 err_unmap_fb:
 	iounmap(ep->fb_base);
 
@@ -389,6 +392,7 @@ static void __devexit e3d_pci_unregister(struct pci_dev *pdev)
 	pci_release_region(pdev, 0);
 	pci_release_region(pdev, 1);
 
+	fb_dealloc_cmap(&info->cmap);
         framebuffer_release(info);
 
 	pci_disable_device(pdev);
-- 
1.5.6.5

Re: [PATCH 10/15] sunxvr500: fix cmap memory leaks

[David Miller]

From: Andres Salomon <dilinger@queued.net>
Date: Sat, 7 Feb 2009 12:15:40 -0500

[ Fixed typo in adaplas's email address ]

>  - fix cmap leak in removal path
>  - fix cmap leak when register_framebuffer fails
> 
> Signed-off-by: Andres Salomon <dilinger@debian.org>

I assume the fbdev folks will pick this up or should I take
it in my sparc tree?

Thanks.

Re: [PATCH 10/15] sunxvr500: fix cmap memory leaks

[Andrew Morton]

On Sun, 08 Feb 2009 16:59:25 -0800 (PST) David Miller <davem@davemloft.net> wrote:

> From: Andres Salomon <dilinger@queued.net>
> Date: Sat, 7 Feb 2009 12:15:40 -0500
> 
> [ Fixed typo in adaplas's email address ]
> 
> >  - fix cmap leak in removal path
> >  - fix cmap leak when register_framebuffer fails
> > 
> > Signed-off-by: Andres Salomon <dilinger@debian.org>
> 
> I assume the fbdev folks will pick this up or should I take
> it in my sparc tree?

(fbdev folks == me) at present.  I'll crunch on these 15 patches
tomorrow.  If you want to queue it in in a sparc tree so that it gets
more-than-zero runtine testing then go for it.

Re: [PATCH 10/15] sunxvr500: fix cmap memory leaks

[David Miller]

From: Andrew Morton <akpm@linux-foundation.org>
Date: Sun, 8 Feb 2009 17:50:24 -0800

> On Sun, 08 Feb 2009 16:59:25 -0800 (PST) David Miller <davem@davemloft.net> wrote:
> 
> > From: Andres Salomon <dilinger@queued.net>
> > Date: Sat, 7 Feb 2009 12:15:40 -0500
> > 
> > [ Fixed typo in adaplas's email address ]
> > 
> > >  - fix cmap leak in removal path
> > >  - fix cmap leak when register_framebuffer fails
> > > 
> > > Signed-off-by: Andres Salomon <dilinger@debian.org>
> > 
> > I assume the fbdev folks will pick this up or should I take
> > it in my sparc tree?
> 
> (fbdev folks == me) at present.  I'll crunch on these 15 patches
> tomorrow.  If you want to queue it in in a sparc tree so that it gets
> more-than-zero runtine testing then go for it.

Nah, you can take it, thanks Andrew :-)