riva/fbdev: fix several -Wuninitialized

commit c718a54649475cc397484f96e70f6d0fdd267165 upstream.

Fix several -Wuninitialized compiler warnings by changing the
order of getting modedb in riva_update_default_var() to set
first the fallback and then the prefered timing.

Signed-off-by: Danny Kukawka <danny.kukawka@bisect.de>
Signed-off-by: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/video/riva/fbdev.c b/drivers/video/riva/fbdev.c
index d8ab7be4fd6b5953ba1f2d57928b541038554c60..fabc90deae391f8cae3e7d7578c9de112fcf58e3 100644 (file)
--- a/drivers/video/riva/fbdev.c
+++ b/drivers/video/riva/fbdev.c
@@ -1816,6 +1816,8 @@ static void __devinit riva_update_default_var(struct fb_var_screeninfo *var,
                             specs->modedb, specs->modedb_len,
                             NULL, 8);
        } else if (specs->modedb != NULL) {
+               /* get first mode in database as fallback */
+               modedb = specs->modedb[0];
                /* get preferred timing */
                if (info->monspecs.misc & FB_MISC_1ST_DETAIL) {
                        int i;
@@ -1826,9 +1828,6 @@ static void __devinit riva_update_default_var(struct fb_var_screeninfo *var,
                                        break;
                                }
                        }
-               } else {
-                       /* otherwise, get first mode in database */
-                       modedb = specs->modedb[0];
                }
                var->bits_per_pixel = 8;
                riva_update_var(var, &modedb);