From c2bc0a756b1f98bd712fabe78eb49d7d5ae72075 Mon Sep 17 00:00:00 2001 From: Wang YanQing Date: Fri, 2 Mar 2012 09:45:31 +0800 Subject: [PATCH] video:uvesafb: notice user when we failed to save hardware state uvesafb_open may failed to save hardware state when kmalloc failed in uvesafb_vbe_state_save, we should check this and notice user. Signed-off-by: Wang YanQing Signed-off-by: Florian Tobias Schandinat --- drivers/video/uvesafb.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/drivers/video/uvesafb.c b/drivers/video/uvesafb.c index f9a670d338d..1f882ed6ba0 100644 --- a/drivers/video/uvesafb.c +++ b/drivers/video/uvesafb.c @@ -363,7 +363,7 @@ static u8 *uvesafb_vbe_state_save(struct uvesafb_par *par) state = kmalloc(par->vbe_state_size, GFP_KERNEL); if (!state) - return NULL; + return ERR_PTR(-ENOMEM); task = uvesafb_prep(); if (!task) { @@ -1180,9 +1180,17 @@ static int uvesafb_open(struct fb_info *info, int user) { struct uvesafb_par *par = info->par; int cnt = atomic_read(&par->ref_count); + u8 *buf = NULL; - if (!cnt && par->vbe_state_size) - par->vbe_state_orig = uvesafb_vbe_state_save(par); + if (!cnt && par->vbe_state_size) { + buf = uvesafb_vbe_state_save(par); + if (IS_ERR(buf)) { + printk(KERN_WARNING "uvesafb: save hardware state" + "failed, error code is %ld!\n", PTR_ERR(buf)); + } else { + par->vbe_state_orig = buf; + } + } atomic_inc(&par->ref_count); return 0;