diff options
author | Krzysztof Helt <krzysztof.h1@wp.pl> | 2009-06-16 18:34:36 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-16 22:48:00 -0400 |
commit | 491bcc9bf5d9a57f2d9cb3ce8ba0f6d48752c113 (patch) | |
tree | c0ef0205d06fd5c09dff1ee8dcec40e2ad28c9df | |
parent | f73323de5a07e2a7bf3e9bca36dcc8057e5446d4 (diff) |
fbdev: use framebuffer_release() for freeing fb_info structures
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>
-rw-r--r-- | drivers/video/offb.c | 2 | ||||
-rw-r--r-- | drivers/video/pm2fb.c | 2 | ||||
-rw-r--r-- | drivers/video/sis/sis_main.c | 4 | ||||
-rw-r--r-- | drivers/video/stifb.c | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/drivers/video/offb.c b/drivers/video/offb.c index bb915a43dd62..4d8c54c23dd7 100644 --- a/drivers/video/offb.c +++ b/drivers/video/offb.c | |||
@@ -493,7 +493,7 @@ static void __init offb_init_fb(const char *name, const char *full_name, | |||
493 | iounmap(par->cmap_adr); | 493 | iounmap(par->cmap_adr); |
494 | par->cmap_adr = NULL; | 494 | par->cmap_adr = NULL; |
495 | iounmap(info->screen_base); | 495 | iounmap(info->screen_base); |
496 | kfree(info); | 496 | framebuffer_release(info); |
497 | release_mem_region(res_start, res_size); | 497 | release_mem_region(res_start, res_size); |
498 | return; | 498 | return; |
499 | } | 499 | } |
diff --git a/drivers/video/pm2fb.c b/drivers/video/pm2fb.c index c6dd924976a4..36436ee6c1a4 100644 --- a/drivers/video/pm2fb.c +++ b/drivers/video/pm2fb.c | |||
@@ -1748,7 +1748,7 @@ static void __devexit pm2fb_remove(struct pci_dev *pdev) | |||
1748 | pci_set_drvdata(pdev, NULL); | 1748 | pci_set_drvdata(pdev, NULL); |
1749 | fb_dealloc_cmap(&info->cmap); | 1749 | fb_dealloc_cmap(&info->cmap); |
1750 | kfree(info->pixmap.addr); | 1750 | kfree(info->pixmap.addr); |
1751 | kfree(info); | 1751 | framebuffer_release(info); |
1752 | } | 1752 | } |
1753 | 1753 | ||
1754 | static struct pci_device_id pm2fb_id_table[] = { | 1754 | static struct pci_device_id pm2fb_id_table[] = { |
diff --git a/drivers/video/sis/sis_main.c b/drivers/video/sis/sis_main.c index 7e17ee95a97a..7072d19080d5 100644 --- a/drivers/video/sis/sis_main.c +++ b/drivers/video/sis/sis_main.c | |||
@@ -5928,7 +5928,7 @@ sisfb_probe(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
5928 | if(pci_enable_device(pdev)) { | 5928 | if(pci_enable_device(pdev)) { |
5929 | if(ivideo->nbridge) pci_dev_put(ivideo->nbridge); | 5929 | if(ivideo->nbridge) pci_dev_put(ivideo->nbridge); |
5930 | pci_set_drvdata(pdev, NULL); | 5930 | pci_set_drvdata(pdev, NULL); |
5931 | kfree(sis_fb_info); | 5931 | framebuffer_release(sis_fb_info); |
5932 | return -EIO; | 5932 | return -EIO; |
5933 | } | 5933 | } |
5934 | } | 5934 | } |
@@ -6134,7 +6134,7 @@ error_3: vfree(ivideo->bios_abase); | |||
6134 | pci_set_drvdata(pdev, NULL); | 6134 | pci_set_drvdata(pdev, NULL); |
6135 | if(!ivideo->sisvga_enabled) | 6135 | if(!ivideo->sisvga_enabled) |
6136 | pci_disable_device(pdev); | 6136 | pci_disable_device(pdev); |
6137 | kfree(sis_fb_info); | 6137 | framebuffer_release(sis_fb_info); |
6138 | return ret; | 6138 | return ret; |
6139 | } | 6139 | } |
6140 | 6140 | ||
diff --git a/drivers/video/stifb.c b/drivers/video/stifb.c index eabaad765aeb..eec9dcb7f599 100644 --- a/drivers/video/stifb.c +++ b/drivers/video/stifb.c | |||
@@ -1380,7 +1380,7 @@ stifb_cleanup(void) | |||
1380 | if (info->screen_base) | 1380 | if (info->screen_base) |
1381 | iounmap(info->screen_base); | 1381 | iounmap(info->screen_base); |
1382 | fb_dealloc_cmap(&info->cmap); | 1382 | fb_dealloc_cmap(&info->cmap); |
1383 | kfree(info); | 1383 | framebuffer_release(info); |
1384 | } | 1384 | } |
1385 | sti->info = NULL; | 1385 | sti->info = NULL; |
1386 | } | 1386 | } |