3.0-stable review patch.  If anyone has any objections, please let me know.

------------------

From: Danny Kukawka <danny.kuka...@bisect.de>

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.kuka...@bisect.de>
Signed-off-by: Florian Tobias Schandinat <florianschandi...@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gre...@linuxfoundation.org>

---
 drivers/video/riva/fbdev.c |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

--- a/drivers/video/riva/fbdev.c
+++ b/drivers/video/riva/fbdev.c
@@ -1816,6 +1816,8 @@ static void __devinit riva_update_defaul
                             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_defaul
                                        break;
                                }
                        }
-               } else {
-                       /* otherwise, get first mode in database */
-                       modedb = specs->modedb[0];
                }
                var->bits_per_pixel = 8;
                riva_update_var(var, &modedb);


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to