fbdev: use framebuffer_release() for freeing fb_info structures
authorKrzysztof Helt <krzysztof.h1@wp.pl>
Tue, 16 Jun 2009 22:34:36 +0000 (15:34 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 17 Jun 2009 02:48:00 +0000 (19:48 -0700)
Use the framebuffer_release() for freeing fb_info structures allocated
with framebuffer_alloc().

Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
drivers/video/offb.c
drivers/video/pm2fb.c
drivers/video/sis/sis_main.c
drivers/video/stifb.c

index bb915a43dd622c515ee63cb44fc26c1956cf99c6..4d8c54c23dd7e320289fadec313d52ec5f333392 100644 (file)
@@ -493,7 +493,7 @@ static void __init offb_init_fb(const char *name, const char *full_name,
                iounmap(par->cmap_adr);
                par->cmap_adr = NULL;
                iounmap(info->screen_base);
                iounmap(par->cmap_adr);
                par->cmap_adr = NULL;
                iounmap(info->screen_base);
-               kfree(info);
+               framebuffer_release(info);
                release_mem_region(res_start, res_size);
                return;
        }
                release_mem_region(res_start, res_size);
                return;
        }
index c6dd924976a4f105457bd15c205a2938a07eeee3..36436ee6c1a4f58076b56b9c99f9e6568e613f3a 100644 (file)
@@ -1748,7 +1748,7 @@ static void __devexit pm2fb_remove(struct pci_dev *pdev)
        pci_set_drvdata(pdev, NULL);
        fb_dealloc_cmap(&info->cmap);
        kfree(info->pixmap.addr);
        pci_set_drvdata(pdev, NULL);
        fb_dealloc_cmap(&info->cmap);
        kfree(info->pixmap.addr);
-       kfree(info);
+       framebuffer_release(info);
 }
 
 static struct pci_device_id pm2fb_id_table[] = {
 }
 
 static struct pci_device_id pm2fb_id_table[] = {
index 7e17ee95a97aa41b4a990ac395453ad19e10d4da..7072d19080d584dbaf2f754dd31c177251932de4 100644 (file)
@@ -5928,7 +5928,7 @@ sisfb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                if(pci_enable_device(pdev)) {
                        if(ivideo->nbridge) pci_dev_put(ivideo->nbridge);
                        pci_set_drvdata(pdev, NULL);
                if(pci_enable_device(pdev)) {
                        if(ivideo->nbridge) pci_dev_put(ivideo->nbridge);
                        pci_set_drvdata(pdev, NULL);
-                       kfree(sis_fb_info);
+                       framebuffer_release(sis_fb_info);
                        return -EIO;
                }
        }
                        return -EIO;
                }
        }
@@ -6134,7 +6134,7 @@ error_3:  vfree(ivideo->bios_abase);
                pci_set_drvdata(pdev, NULL);
                if(!ivideo->sisvga_enabled)
                        pci_disable_device(pdev);
                pci_set_drvdata(pdev, NULL);
                if(!ivideo->sisvga_enabled)
                        pci_disable_device(pdev);
-               kfree(sis_fb_info);
+               framebuffer_release(sis_fb_info);
                return ret;
        }
 
                return ret;
        }
 
index eabaad765aebcdf1e975c8d68108e098a330175d..eec9dcb7f59976f2a9fe337322fb82724a4ed5fe 100644 (file)
@@ -1380,7 +1380,7 @@ stifb_cleanup(void)
                                if (info->screen_base)
                                        iounmap(info->screen_base);
                        fb_dealloc_cmap(&info->cmap);
                                if (info->screen_base)
                                        iounmap(info->screen_base);
                        fb_dealloc_cmap(&info->cmap);
-                       kfree(info); 
+                       framebuffer_release(info);
                }
                sti->info = NULL;
        }
                }
                sti->info = NULL;
        }