Merge branch 'linus' into x86/i8259

1 files changed, 2 insertions, 0 deletions

diff --git a/drivers/video/modedb.c b/drivers/video/modedb.c
index 473562191586..d3c3af53a290 100644
--- a/drivers/video/modedb.c
+++ b/drivers/video/modedb.c
@@ -28,6 +28,7 @@
 #endif
 
 const char *fb_mode_option;
+EXPORT_SYMBOL_GPL(fb_mode_option);
 
     /*
      *  Standard video mode definitions (taken from XFree86)
@@ -590,6 +591,7 @@ done:
                     "", (margins) ? " with margins" : "", (interlace) ?
                     " interlaced" : "");
 
+            memset(&cvt_mode, 0, sizeof(cvt_mode));
             cvt_mode.xres = xres;
             cvt_mode.yres = yres;
             cvt_mode.refresh = (refresh) ? refresh : 60;