dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

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 <udknight@gmail.com>
Signed-off-by: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
This commit is contained in:
Wang YanQing 2012-03-02 09:45:31 +08:00 committed by Florian Tobias Schandinat
parent ec0d22e4d5
commit c2bc0a756b
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/video/uvesafb.c
View File

@ -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;