Skip to content

Commit 7ddaba0

Browse files
dalgaafgregkh
authored andcommitted
riva/fbdev: fix several -Wuninitialized
commit c718a54 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 <[email protected]> Signed-off-by: Florian Tobias Schandinat <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 6ce2a94 commit 7ddaba0

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

drivers/video/riva/fbdev.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1816,6 +1816,8 @@ static void __devinit riva_update_default_var(struct fb_var_screeninfo *var,
18161816
specs->modedb, specs->modedb_len,
18171817
NULL, 8);
18181818
} else if (specs->modedb != NULL) {
1819+
/* get first mode in database as fallback */
1820+
modedb = specs->modedb[0];
18191821
/* get preferred timing */
18201822
if (info->monspecs.misc & FB_MISC_1ST_DETAIL) {
18211823
int i;
@@ -1826,9 +1828,6 @@ static void __devinit riva_update_default_var(struct fb_var_screeninfo *var,
18261828
break;
18271829
}
18281830
}
1829-
} else {
1830-
/* otherwise, get first mode in database */
1831-
modedb = specs->modedb[0];
18321831
}
18331832
var->bits_per_pixel = 8;
18341833
riva_update_var(var, &modedb);

0 commit comments

Comments
 (0)