Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

[firefly-linux-kernel-4.4.55.git] / drivers / tty / rocket.c

diff --git a/drivers/tty/rocket.c b/drivers/tty/rocket.c
index 383c4c796637713e12bede50677803a0d639a855..c8dd8dc31086ee5d373427dc5a7f04bee7cce1bb 100644 (file)
--- a/drivers/tty/rocket.c
+++ b/drivers/tty/rocket.c
@@ -1390,7 +1390,7 @@ static void rp_unthrottle(struct tty_struct *tty)
               tty->ldisc.chars_in_buffer(tty));
 #endif
 
-       if (rocket_paranoia_check(info, "rp_throttle"))
+       if (rocket_paranoia_check(info, "rp_unthrottle"))
                return;
 
        if (I_IXOFF(tty))
@@ -1458,7 +1458,7 @@ static void rp_wait_until_sent(struct tty_struct *tty, int timeout)
 
        orig_jiffies = jiffies;
 #ifdef ROCKET_DEBUG_WAIT_UNTIL_SENT
-       printk(KERN_INFO "In RP_wait_until_sent(%d) (jiff=%lu)...\n", timeout,
+       printk(KERN_INFO "In %s(%d) (jiff=%lu)...\n", __func__, timeout,
               jiffies);
        printk(KERN_INFO "cps=%d...\n", info->cps);
 #endif