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 /drivers/video/sis | |
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>
Diffstat (limited to 'drivers/video/sis')
-rw-r--r-- | drivers/video/sis/sis_main.c | 4 |
1 files changed, 2 insertions, 2 deletions
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 | ||