X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=drivers%2Fvideo%2Ffbmem.c;h=0737570030f5e85459b4f926e3a4e8a7aaa09b3d;hb=56c5d900dbb8e042bfad035d18433476931d8f93;hp=6b487801eeaedc96e8b65a330363156e32452f6c;hpb=881b374705f352725ba1f558968ef34c17ba900e;p=linux-2.6-omap-h63xx.git

diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c
index 6b487801eea..0737570030f 100644
--- a/drivers/video/fbmem.c
+++ b/drivers/video/fbmem.c
@@ -979,6 +979,7 @@ fb_set_var(struct fb_info *info, struct fb_var_screeninfo *var)
 
 				info->flags &= ~FBINFO_MISC_USEREVENT;
 				event.info = info;
+				event.data = &mode;
 				fb_notifier_call_chain(evnt, &event);
 			}
 		}
@@ -1344,6 +1345,10 @@ fb_open(struct inode *inode, struct file *file)
 		if (res)
 			module_put(info->fbops->owner);
 	}
+#ifdef CONFIG_FB_DEFERRED_IO
+	if (info->fbdefio)
+		fb_deferred_io_open(info, inode, file);
+#endif
 out:
 	unlock_kernel();
 	return res;