video:uvesafb: notice user when we failed to save hardware state (c2bc0a75) · Commits · 戴 / test

drivers/video/uvesafb.c

+11 −3

Original line number	Original line	Diff line number	Diff line
	@@ -363,7 +363,7 @@ static u8 uvesafb_vbe_state_save(struct uvesafb_par par)

	state = kmalloc(par->vbe_state_size, GFP_KERNEL);		state = kmalloc(par->vbe_state_size, GFP_KERNEL);
	if (!state)		if (!state)
	return NULL;		return ERR_PTR(-ENOMEM);

	task = uvesafb_prep();		task = uvesafb_prep();
	if (!task) {		if (!task) {
	@@ -1180,9 +1180,17 @@ static int uvesafb_open(struct fb_info *info, int user)
	{		{
	struct uvesafb_par *par = info->par;		struct uvesafb_par *par = info->par;
	int cnt = atomic_read(&par->ref_count);		int cnt = atomic_read(&par->ref_count);
			u8 *buf = NULL;

	if (!cnt && par->vbe_state_size)		if (!cnt && par->vbe_state_size) {
	par->vbe_state_orig = uvesafb_vbe_state_save(par);		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);		atomic_inc(&par->ref_count);
	return 0;		return 0;