aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video/console/fbcon.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/video/console/fbcon.c')
-rw-r--r--drivers/video/console/fbcon.c17
1 files changed, 2 insertions, 15 deletions
diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c
index 188053eafc69..e111a88612f7 100644
--- a/drivers/video/console/fbcon.c
+++ b/drivers/video/console/fbcon.c
@@ -1886,24 +1886,11 @@ static int fbcon_resize(struct vc_data *vc, unsigned int width,
1886 mode = fb_find_best_mode(&var, &info->modelist); 1886 mode = fb_find_best_mode(&var, &info->modelist);
1887 if (mode == NULL) 1887 if (mode == NULL)
1888 return -EINVAL; 1888 return -EINVAL;
1889 display_to_var(&var, p);
1889 fb_videomode_to_var(&var, mode); 1890 fb_videomode_to_var(&var, mode);
1891
1890 if (width > var.xres/fw || height > var.yres/fh) 1892 if (width > var.xres/fw || height > var.yres/fh)
1891 return -EINVAL; 1893 return -EINVAL;
1892 /*
1893 * The following can probably have any value... Do we need to
1894 * set all of them?
1895 */
1896 var.bits_per_pixel = p->bits_per_pixel;
1897 var.xres_virtual = p->xres_virtual;
1898 var.yres_virtual = p->yres_virtual;
1899 var.accel_flags = p->accel_flags;
1900 var.width = p->width;
1901 var.height = p->height;
1902 var.red = p->red;
1903 var.green = p->green;
1904 var.blue = p->blue;
1905 var.transp = p->transp;
1906 var.nonstd = p->nonstd;
1907 1894
1908 DPRINTK("resize now %ix%i\n", var.xres, var.yres); 1895 DPRINTK("resize now %ix%i\n", var.xres, var.yres);
1909 if (CON_IS_VISIBLE(vc)) { 1896 if (CON_IS_VISIBLE(vc)) {