diff options
Diffstat (limited to 'drivers/video/console/vgacon.c')
-rw-r--r-- | drivers/video/console/vgacon.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/video/console/vgacon.c b/drivers/video/console/vgacon.c index d18b73aafa0d..e9afb7ebd566 100644 --- a/drivers/video/console/vgacon.c +++ b/drivers/video/console/vgacon.c | |||
@@ -1278,13 +1278,14 @@ static int vgacon_font_get(struct vc_data *c, struct console_font *font) | |||
1278 | #endif | 1278 | #endif |
1279 | 1279 | ||
1280 | static int vgacon_resize(struct vc_data *c, unsigned int width, | 1280 | static int vgacon_resize(struct vc_data *c, unsigned int width, |
1281 | unsigned int height) | 1281 | unsigned int height, unsigned int user) |
1282 | { | 1282 | { |
1283 | if (width % 2 || width > ORIG_VIDEO_COLS || | 1283 | if (width % 2 || width > ORIG_VIDEO_COLS || |
1284 | height > (ORIG_VIDEO_LINES * vga_default_font_height)/ | 1284 | height > (ORIG_VIDEO_LINES * vga_default_font_height)/ |
1285 | c->vc_font.height) | 1285 | c->vc_font.height) |
1286 | /* let svgatextmode tinker with video timings */ | 1286 | /* let svgatextmode tinker with video timings and |
1287 | return 0; | 1287 | return success */ |
1288 | return (user) ? 0 : -EINVAL; | ||
1288 | 1289 | ||
1289 | if (CON_IS_VISIBLE(c) && !vga_is_gfx) /* who knows */ | 1290 | if (CON_IS_VISIBLE(c) && !vga_is_gfx) /* who knows */ |
1290 | vgacon_doresize(c, width, height); | 1291 | vgacon_doresize(c, width, height); |