From 362df6541b55f9df021bafb82c3e16f9d6d3a655 Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 17 Jul 2009 08:53:41 -0700
Subject: [PATCH] --- yaml --- r: 155523 b: refs/heads/master c:
 301d95c4dade09388f94258ee797d2d650dc00b5 h: refs/heads/master i:   155521:
 805fc64bed35b00e2bab3874ca656e35c6df66a7   155519:
 2063217053a6ea009c8abbc0a699c9ee29bdb916 v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/char/tty_port.c        | 2 +-
 trunk/kernel/trace/trace_functions.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index d5ece8326476..c7b82e52f4be 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e79f07e2925b10f09a2621650c16f3d6ea778747
+refs/heads/master: 301d95c4dade09388f94258ee797d2d650dc00b5
diff --git a/trunk/drivers/char/tty_port.c b/trunk/drivers/char/tty_port.c
index 4e862a75f7ff..9769b1149f76 100644
--- a/trunk/drivers/char/tty_port.c
+++ b/trunk/drivers/char/tty_port.c
@@ -267,7 +267,7 @@ int tty_port_block_til_ready(struct tty_port *port,
 	if (retval == 0)
 		port->flags |= ASYNC_NORMAL_ACTIVE;
 	spin_unlock_irqrestore(&port->lock, flags);
-	return 0;
+	return retval;
 	
 }
 EXPORT_SYMBOL(tty_port_block_til_ready);
diff --git a/trunk/kernel/trace/trace_functions.c b/trunk/kernel/trace/trace_functions.c
index 7402144bff21..75ef000613c3 100644
--- a/trunk/kernel/trace/trace_functions.c
+++ b/trunk/kernel/trace/trace_functions.c
@@ -363,7 +363,7 @@ ftrace_trace_onoff_callback(char *glob, char *cmd, char *param, int enable)
  out_reg:
 	ret = register_ftrace_function_probe(glob, ops, count);
 
-	return ret;
+	return ret < 0 ? ret : 0;
 }
 
 static struct ftrace_func_command ftrace_traceon_cmd = {