Re: [Linux-fbdev-devel] [PATCH 9/15] valkyriefb: checkfb_alloc_cmap return value and handle failure properly

From: Krzysztof Helt
Date: Mon Feb 09 2009 - 12:02:59 EST


On Sat, 7 Feb 2009 12:15:26 -0500
Andres Salomon <dilinger@xxxxxxxxxx> wrote:

>
> Signed-off-by: Andres Salomon <dilinger@xxxxxxxxxx>
> ---

Acked-by: Krzysztof Helt <krzysztof.h1@xxxxx>


> drivers/video/valkyriefb.c | 15 ++++++++++-----
> 1 files changed, 10 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/video/valkyriefb.c b/drivers/video/valkyriefb.c
> index 7b0cef9..4bb9a0b 100644
> --- a/drivers/video/valkyriefb.c
> +++ b/drivers/video/valkyriefb.c
> @@ -119,7 +119,7 @@ static void set_valkyrie_clock(unsigned char *params);
> static int valkyrie_var_to_par(struct fb_var_screeninfo *var,
> struct fb_par_valkyrie *par, const struct fb_info *fb_info);
>
> -static void valkyrie_init_info(struct fb_info *info, struct fb_info_valkyrie *p);
> +static int valkyrie_init_info(struct fb_info *info, struct fb_info_valkyrie *p);
> static void valkyrie_par_to_fix(struct fb_par_valkyrie *par, struct fb_fix_screeninfo *fix);
> static void valkyrie_init_fix(struct fb_fix_screeninfo *fix, struct fb_info_valkyrie *p);
>
> @@ -381,18 +381,22 @@ int __init valkyriefb_init(void)
>
> valkyrie_choose_mode(p);
> mac_vmode_to_var(default_vmode, default_cmode, &p->info.var);
> - valkyrie_init_info(&p->info, p);
> + err = valkyrie_init_info(&p->info, p);
> + if (err < 0)
> + goto out_free;
> valkyrie_init_fix(&p->info.fix, p);
> if (valkyriefb_set_par(&p->info))
> /* "can't happen" */
> printk(KERN_ERR "valkyriefb: can't set default video mode\n");
>
> if ((err = register_framebuffer(&p->info)) != 0)
> - goto out_free;
> + goto out_cmap_free;
>
> printk(KERN_INFO "fb%d: valkyrie frame buffer device\n", p->info.node);
> return 0;
>
> + out_cmap_free:
> + fb_dealloc_cmap(&p->info.cmap);
> out_free:
> if (p->frame_buffer)
> iounmap(p->frame_buffer);
> @@ -538,14 +542,15 @@ static void valkyrie_par_to_fix(struct fb_par_valkyrie *par,
> /* ywrapstep, xpanstep, ypanstep */
> }
>
> -static void __init valkyrie_init_info(struct fb_info *info, struct fb_info_valkyrie *p)
> +static int __init valkyrie_init_info(struct fb_info *info,
> + struct fb_info_valkyrie *p)
> {
> info->fbops = &valkyriefb_ops;
> info->screen_base = p->frame_buffer + 0x1000;
> info->flags = FBINFO_DEFAULT;
> info->pseudo_palette = p->pseudo_palette;
> - fb_alloc_cmap(&info->cmap, 256, 0);
> info->par = &p->par;
> + return fb_alloc_cmap(&info->cmap, 256, 0);
> }
>
>
> --
> 1.5.6.5
>
>
> ------------------------------------------------------------------------------
> Create and Deploy Rich Internet Apps outside the browser with Adobe(R)AIR(TM)
> software. With Adobe AIR, Ajax developers can use existing skills and code to
> build responsive, highly engaging applications that combine the power of local
> resources and data with the reach of the web. Download the Adobe AIR SDK and
> Ajax docs to start building applications today-http://p.sf.net/sfu/adobe-com
> _______________________________________________
> Linux-fbdev-devel mailing list
> Linux-fbdev-devel@xxxxxxxxxxxxxxxxxxxxx
> https://lists.sourceforge.net/lists/listinfo/linux-fbdev-devel
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/