From: "Antonino A. Daplas" The function fb_add_videomode can fail, check return value. Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton --- 25-akpm/drivers/video/fbmem.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff -puN drivers/video/fbmem.c~fbdev-check-return-value-of-fb_add_videomode drivers/video/fbmem.c --- 25/drivers/video/fbmem.c~fbdev-check-return-value-of-fb_add_videomode Thu Dec 23 14:11:11 2004 +++ 25-akpm/drivers/video/fbmem.c Thu Dec 23 14:11:11 2004 @@ -716,6 +716,7 @@ fb_set_var(struct fb_info *info, struct if ((var->activate & FB_ACTIVATE_MASK) == FB_ACTIVATE_NOW) { struct fb_videomode mode; info->var = *var; + int err = 0; if (info->fbops->fb_set_par) info->fbops->fb_set_par(info); @@ -728,15 +729,16 @@ fb_set_var(struct fb_info *info, struct if (info->modelist.prev && info->modelist.next && !list_empty(&info->modelist)) - fb_add_videomode(&mode, &info->modelist); + err = fb_add_videomode(&mode, &info->modelist); - if (info->flags & FBINFO_MISC_USEREVENT) { + if (!err && info->flags & FBINFO_MISC_USEREVENT) { struct fb_event event; info->flags &= ~FBINFO_MISC_USEREVENT; event.info = info; notifier_call_chain(&fb_notifier_list, - FB_EVENT_MODE_CHANGE, &event); + FB_EVENT_MODE_CHANGE, + &event); } } } _