summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaura Abbott2018-09-11 01:20:14 +0200
committerGreg Kroah-Hartman2018-09-18 16:07:23 +0200
commit2dd453168643d9475028cd867c57e65956a0f7f9 (patch)
tree63ee154e033433fa36827d52a82e25e02f09b838
parentkgdboc: Change printk to the right fashion (diff)
downloadkernel-qcow2-linux-2dd453168643d9475028cd867c57e65956a0f7f9.tar.gz
kernel-qcow2-linux-2dd453168643d9475028cd867c57e65956a0f7f9.tar.xz
kernel-qcow2-linux-2dd453168643d9475028cd867c57e65956a0f7f9.zip
kgdboc: Fix restrict error
There's an error when compiled with restrict: drivers/tty/serial/kgdboc.c: In function ‘configure_kgdboc’: drivers/tty/serial/kgdboc.c:137:2: error: ‘strcpy’ source argument is the same as destination [-Werror=restrict] strcpy(config, opt); ^~~~~~~~~~~~~~~~~~~ As the error implies, this is from trying to use config as both source and destination. Drop the call to the function where config is the argument since nothing else happens in the function. Signed-off-by: Laura Abbott <labbott@redhat.com> Reviewed-by: Daniel Thompson <daniel.thompson@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/tty/serial/kgdboc.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/tty/serial/kgdboc.c b/drivers/tty/serial/kgdboc.c
index 371357d5e216..e9a83bb5bee5 100644
--- a/drivers/tty/serial/kgdboc.c
+++ b/drivers/tty/serial/kgdboc.c
@@ -162,15 +162,13 @@ static int configure_kgdboc(void)
{
struct tty_driver *p;
int tty_line = 0;
- int err;
+ int err = -ENODEV;
char *cptr = config;
struct console *cons;
- err = kgdboc_option_setup(config);
- if (err || !strlen(config) || isspace(config[0]))
+ if (!strlen(config) || isspace(config[0]))
goto noconfig;
- err = -ENODEV;
kgdboc_io_ops.is_console = 0;
kgdb_tty_driver = NULL;