From 67cecd09d850542e00a1d9a29567232d1224cf23 Mon Sep 17 00:00:00 2001
From: Paul Cercueil <p...@crapouillou.net>
Date: Thu, 12 Jan 2012 19:40:24 +0100
Subject: [PATCH 4/4] fbcon: optimize parameters parsing loop.


Signed-off-by: Paul Cercueil <p...@crapouillou.net>
---
 drivers/video/console/fbcon.c |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c
index 9b83b75..1ecaf68 100644
--- a/drivers/video/console/fbcon.c
+++ b/drivers/video/console/fbcon.c
@@ -441,8 +441,10 @@ static int __init fb_console_setup(char *this_opt)
                return 1;

        while ((options = strsep(&this_opt, ",")) != NULL) {
-               if (!strncmp(options, "font:", 5))
+               if (!strncmp(options, "font:", 5)) {
                        strlcpy(fontname, options + 5, sizeof(fontname));
+                       continue;
+               }

                if (!strncmp(options, "scrollback:", 11)) {
                        char *k;
@@ -468,6 +470,7 @@ static int __init fb_console_setup(char *this_opt)
                        /* (k && *k): Check for garbage after the suffix */
                        if (ret || (k && *k))
                                pr_warn("fbcon: scrollback: incorrect 
value.\n");
+                       continue;
                }

                if (!strncmp(options, "map:", 4)) {
@@ -484,6 +487,7 @@ static int __init fb_console_setup(char *this_opt)
                        } else {
                                pr_warn("fbcon: map: incorrect value.\n");
                        }
+                       continue;
                }

                if (!strncmp(options, "vc:", 3)) {
@@ -513,6 +517,7 @@ static int __init fb_console_setup(char *this_opt)
                                fbcon_is_default = 0;
                        else
                                pr_warn("fbcon: vc: incorrect value.\n");
+                       continue;
                }

                if (!strncmp(options, "rotate:", 7)) {
@@ -525,6 +530,7 @@ static int __init fb_console_setup(char *this_opt)
                        } else {
                                pr_warn("fbcon: rotate: incorrect value.\n");
                        }
+                       continue;
                }
        }
        return 1;
--
1.7.10.4

--
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