* [PATCH 14/15] amifb: check fb_alloc_cmap return value and handle failure properly
@ 2009-02-07 17:18 Andres Salomon
2009-02-09 20:26 ` [Linux-fbdev-devel] " Krzysztof Helt
0 siblings, 1 reply; 3+ messages in thread
From: Andres Salomon @ 2009-02-07 17:18 UTC (permalink / raw)
To: Andrew Morton; +Cc: linux-kernel, linux-fbdev-devel, adaplas
Signed-off-by: Andres Salomon <dilinger@debian.org>
---
drivers/video/amifb.c | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/drivers/video/amifb.c b/drivers/video/amifb.c
index 100f236..82bedd7 100644
--- a/drivers/video/amifb.c
+++ b/drivers/video/amifb.c
@@ -2437,7 +2437,9 @@ default_chipset:
goto amifb_error;
}
- fb_alloc_cmap(&fb_info.cmap, 1<<fb_info.var.bits_per_pixel, 0);
+ err = fb_alloc_cmap(&fb_info.cmap, 1<<fb_info.var.bits_per_pixel, 0);
+ if (err)
+ goto amifb_error;
if (register_framebuffer(&fb_info) < 0) {
err = -EINVAL;
@@ -2456,7 +2458,8 @@ amifb_error:
static void amifb_deinit(void)
{
- fb_dealloc_cmap(&fb_info.cmap);
+ if (fb_info.cmap.len)
+ fb_dealloc_cmap(&fb_info.cmap);
chipfree();
if (videomemory)
iounmap((void*)videomemory);
--
1.5.6.5
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [Linux-fbdev-devel] [PATCH 14/15] amifb: check fb_alloc_cmap return value and handle failure properly
2009-02-07 17:18 [PATCH 14/15] amifb: check fb_alloc_cmap return value and handle failure properly Andres Salomon
@ 2009-02-09 20:26 ` Krzysztof Helt
2009-02-09 21:51 ` Andres Salomon
0 siblings, 1 reply; 3+ messages in thread
From: Krzysztof Helt @ 2009-02-09 20:26 UTC (permalink / raw)
To: Andres Salomon; +Cc: Andrew Morton, linux-fbdev-devel, linux-kernel, adaplas
On Sat, 7 Feb 2009 12:18:57 -0500
Andres Salomon <dilinger@queued.net> wrote:
>
> Signed-off-by: Andres Salomon <dilinger@debian.org>
> ---
Acked-by: Krzysztof Helt <krzysztof.h1@wp.pl>
One comment below.
> drivers/video/amifb.c | 7 +++++--
> 1 files changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/video/amifb.c b/drivers/video/amifb.c
> index 100f236..82bedd7 100644
> --- a/drivers/video/amifb.c
> +++ b/drivers/video/amifb.c
> @@ -2437,7 +2437,9 @@ default_chipset:
> goto amifb_error;
> }
>
> - fb_alloc_cmap(&fb_info.cmap, 1<<fb_info.var.bits_per_pixel, 0);
> + err = fb_alloc_cmap(&fb_info.cmap, 1<<fb_info.var.bits_per_pixel, 0);
> + if (err)
> + goto amifb_error;
>
> if (register_framebuffer(&fb_info) < 0) {
> err = -EINVAL;
> @@ -2456,7 +2458,8 @@ amifb_error:
>
> static void amifb_deinit(void)
> {
> - fb_dealloc_cmap(&fb_info.cmap);
> + if (fb_info.cmap.len)
> + fb_dealloc_cmap(&fb_info.cmap);
Again, is the "if(fb_info.cmap.len)" needed here?
> chipfree();
> if (videomemory)
> iounmap((void*)videomemory);
> --
> 1.5.6.5
>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [Linux-fbdev-devel] [PATCH 14/15] amifb: check fb_alloc_cmap return value and handle failure properly
2009-02-09 20:26 ` [Linux-fbdev-devel] " Krzysztof Helt
@ 2009-02-09 21:51 ` Andres Salomon
0 siblings, 0 replies; 3+ messages in thread
From: Andres Salomon @ 2009-02-09 21:51 UTC (permalink / raw)
To: Krzysztof Helt; +Cc: Andrew Morton, linux-fbdev-devel, linux-kernel, adaplas
On Mon, 9 Feb 2009 21:26:29 +0100
Krzysztof Helt <krzysztof.h1@wp.pl> wrote:
> On Sat, 7 Feb 2009 12:18:57 -0500
> Andres Salomon <dilinger@queued.net> wrote:
>
> >
> > Signed-off-by: Andres Salomon <dilinger@debian.org>
> > ---
>
> Acked-by: Krzysztof Helt <krzysztof.h1@wp.pl>
>
> One comment below.
[...]
> > @@ -2456,7 +2458,8 @@ amifb_error:
> >
> > static void amifb_deinit(void)
> > {
> > - fb_dealloc_cmap(&fb_info.cmap);
> > + if (fb_info.cmap.len)
> > + fb_dealloc_cmap(&fb_info.cmap);
>
> Again, is the "if(fb_info.cmap.len)" needed here?
Yep; amifb_deinit is called from amifb_init in the case of errors.
This can happen before fb_alloc_cmap is called (but after the memory
region has been requested), so we need to explicitly check that cmap
memory has been allocated.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2009-02-09 21:51 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-02-07 17:18 [PATCH 14/15] amifb: check fb_alloc_cmap return value and handle failure properly Andres Salomon
2009-02-09 20:26 ` [Linux-fbdev-devel] " Krzysztof Helt
2009-02-09 21:51 ` Andres Salomon
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox