From cdcfa488771b47e7b7cf8b6f2e4f37e1901d5e8e Mon Sep 17 00:00:00 2001 From: Andres Salomon Date: Tue, 31 Mar 2009 15:25:28 -0700 Subject: [PATCH] --- yaml --- r: 139278 b: refs/heads/master c: e98d9b407c248ba1419bed0823488d3cc71a2c31 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/video/68328fb.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index f5ce818838d9..15ebeea31cdc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 327fc8752a3c08fc7dc7d382883e65aad2f03bde +refs/heads/master: e98d9b407c248ba1419bed0823488d3cc71a2c31 diff --git a/trunk/drivers/video/68328fb.c b/trunk/drivers/video/68328fb.c index 7f907fb23b8a..0b17824b0eb5 100644 --- a/trunk/drivers/video/68328fb.c +++ b/trunk/drivers/video/68328fb.c @@ -471,9 +471,11 @@ int __init mc68x328fb_init(void) fb_info.pseudo_palette = &mc68x328fb_pseudo_palette; fb_info.flags = FBINFO_DEFAULT | FBINFO_HWACCEL_YPAN; - fb_alloc_cmap(&fb_info.cmap, 256, 0); + if (fb_alloc_cmap(&fb_info.cmap, 256, 0)) + return -ENOMEM; if (register_framebuffer(&fb_info) < 0) { + fb_dealloc_cmap(&fb_info.cmap); return -EINVAL; } @@ -494,6 +496,7 @@ module_init(mc68x328fb_init); static void __exit mc68x328fb_cleanup(void) { unregister_framebuffer(&fb_info); + fb_dealloc_cmap(&fb_info.cmap); } module_exit(mc68x328fb_cleanup);