Fix compile warning in kernel/params.c

[linux-2.6-omap-h63xx.git] / drivers / serial / kgdboc.c

diff --git a/drivers/serial/kgdboc.c b/drivers/serial/kgdboc.c
index 341830791608796f88633dda02c531c0ed0318b9..eadc1ab6bbcead8918a19773a7db2f08d85ec0a3 100644 (file)
--- a/drivers/serial/kgdboc.c
+++ b/drivers/serial/kgdboc.c
@@ -96,17 +96,21 @@ static void cleanup_kgdboc(void)
 
 static int kgdboc_get_char(void)
 {
-       return kgdb_tty_driver->poll_get_char(kgdb_tty_driver, kgdb_tty_line);
+       return kgdb_tty_driver->ops->poll_get_char(kgdb_tty_driver,
+                                               kgdb_tty_line);
 }
 
 static void kgdboc_put_char(u8 chr)
 {
-       kgdb_tty_driver->poll_put_char(kgdb_tty_driver, kgdb_tty_line, chr);
+       kgdb_tty_driver->ops->poll_put_char(kgdb_tty_driver,
+                                       kgdb_tty_line, chr);
 }
 
 static int param_set_kgdboc_var(const char *kmessage, struct kernel_param *kp)
 {
-       if (strlen(kmessage) >= MAX_CONFIG_LEN) {
+       int len = strlen(kmessage);
+
+       if (len >= MAX_CONFIG_LEN) {
                printk(KERN_ERR "kgdboc: config string too long\n");
                return -ENOSPC;
        }
@@ -125,6 +129,9 @@ static int param_set_kgdboc_var(const char *kmessage, struct kernel_param *kp)
        }
 
        strcpy(config, kmessage);
+       /* Chop out \n char as a result of echo */
+       if (config[len - 1] == '\n')
+               config[len - 1] = '\0';
 
        if (configured == 1)
                cleanup_kgdboc();