Store EDID only when CONFIG_VIDEO_SELECT is set and edid

function actually exists.

diff --git a/arch/i386/boot/video.S b/arch/i386/boot/video.S
index 2e1f38ba94249f64fe20d65fd215c4ebe5bcd3fc..7e2c665e6a530464d93da0712d00f5918bd64f80 100644 (file)
--- a/arch/i386/boot/video.S
+++ b/arch/i386/boot/video.S
@@ -133,9 +133,9 @@ vid1:
 #ifdef CONFIG_VIDEO_RETAIN
        call    restore_screen                  # Restore screen contents
 #endif /* CONFIG_VIDEO_RETAIN */
+       call    store_edid
 #endif /* CONFIG_VIDEO_SELECT */
        call    mode_params                     # Store mode parameters
-       call    store_edid
        popw    %ds                             # Restore original DS
        ret