earlycon: Use a pointer table to fix __earlycon_table stride

[mirror_ubuntu-bionic-kernel.git] / drivers / tty / serial / earlycon.c

diff --git a/drivers/tty/serial/earlycon.c b/drivers/tty/serial/earlycon.c
index ade1bbbeb9c9cb1a9064362fad20ac90f17a4ff0..e20540dab7fb1f351eec9eead7ec2a06d83ef35f 100644 (file)
--- a/drivers/tty/serial/earlycon.c
+++ b/drivers/tty/serial/earlycon.c
@@ -169,7 +169,7 @@ static int __init register_earlycon(char *buf, const struct earlycon_id *match)
  */
 int __init setup_earlycon(char *buf)
 {
-       const struct earlycon_id *match;
+       const struct earlycon_id **p_match;
 
        if (!buf || !buf[0])
                return -EINVAL;
@@ -177,7 +177,9 @@ int __init setup_earlycon(char *buf)
        if (early_con.flags & CON_ENABLED)
                return -EALREADY;
 
-       for (match = __earlycon_table; match < __earlycon_table_end; match++) {
+       for (p_match = __earlycon_table; p_match < __earlycon_table_end;
+            p_match++) {
+               const struct earlycon_id *match = *p_match;
                size_t len = strlen(match->name);
 
                if (strncmp(buf, match->name, len))