From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Tue, 25 Jun 2024 05:58:07 +0000 (+0200)
Subject: Revert "printk: Don't try to parse DEVNAME:0.0 console options"
X-Git-Tag: v6.10-rc6~6^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=64f9f010c6177dd4f33e5023d2eab9af4af291e9;p=thirdparty%2Flinux.git

Revert "printk: Don't try to parse DEVNAME:0.0 console options"

This reverts commit 8a831c584e6e80cf68f79893dc395c16cdf47dc8.

Let's roll back all of the serial core and printk console changes that
went into 6.10-rc1 as there still are problems with them that need to be
sorted out.

Link: https://lore.kernel.org/r/ZnpRozsdw6zbjqze@tlindgre-MOBL1
Reported-by: Petr Mladek <pmladek@suse.com>
Reported-by: Tony Lindgren <tony@atomide.com>
Cc: Jiri Slaby <jirislaby@kernel.org>
Cc: John Ogness <john.ogness@linutronix.de>
Cc: Sergey Senozhatsky <senozhatsky@chromium.org>
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
index e6e6a47acec83..b582404cd29d1 100644
--- a/kernel/printk/printk.c
+++ b/kernel/printk/printk.c
@@ -2504,10 +2504,6 @@ static int __init console_setup(char *str)
 	if (console_opt_save(str, brl_options))
 		return 1;
 
-	/* Don't attempt to parse a DEVNAME:0.0 style console */
-	if (strchr(str, ':'))
-		return 1;
-
 	/*
 	 * Decode str into name, index, options.
 	 */