summaryrefslogtreecommitdiff
path: root/drivers/video/tegra/fb.c
diff options
context:
space:
mode:
authorDan Willemsen <dwillemsen@nvidia.com>2011-04-13 13:30:33 -0700
committerDan Willemsen <dwillemsen@nvidia.com>2011-11-30 21:46:41 -0800
commite5ffcb84cf295baaa4fe21e339e0126fa7f2ead6 (patch)
tree033a1c748967434f7219fa7521c59ab84d86367f /drivers/video/tegra/fb.c
parent97b00233032b0d5204770ceb4411571425b57bfd (diff)
DEVFIX: upstreamed
Rebase-Id: Rebec6e6d6ea7463417a63bcf5fe30cb9f8aa0211
Diffstat (limited to 'drivers/video/tegra/fb.c')
-rw-r--r--drivers/video/tegra/fb.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/drivers/video/tegra/fb.c b/drivers/video/tegra/fb.c
index 815c0fd0ad94..05eeb6a365cd 100644
--- a/drivers/video/tegra/fb.c
+++ b/drivers/video/tegra/fb.c
@@ -604,7 +604,11 @@ static int tegra_fb_ioctl(struct fb_info *info, unsigned int cmd, unsigned long
if (i >= modedb.modedb_len)
break;
+
+ /* fb_videomode_to_var doesn't fill out all the members
+ of fb_var_screeninfo */
memset(&var, 0x0, sizeof(var));
+
fb_videomode_to_var(&var, &modelist->mode);
if (copy_to_user((void __user *)&modedb.modedb[i],
@@ -700,8 +704,10 @@ void tegra_fb_update_monspecs(struct tegra_fb_info *fb_info,
fb_info->info->mode = (struct fb_videomode *)
fb_find_best_display(specs, &fb_info->info->modelist);
- memset(&fb_info->info->var, 0x0,
- sizeof(fb_info->info->var));
+ /* fb_videomode_to_var doesn't fill out all the members
+ of fb_var_screeninfo */
+ memset(&fb_info->info->var, 0x0, sizeof(fb_info->info->var));
+
fb_videomode_to_var(&fb_info->info->var, fb_info->info->mode);
tegra_fb_set_par(fb_info->info);
}