diff --git a/[refs] b/[refs]
index 5c1e50f0d740..5a1c0a4eb39f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ecc2e05e739c30870c8e4f252b63a0c4041f2724
+refs/heads/master: 04aef32d39cc4ef80087c0ce8ed113c6d64f1a6b
diff --git a/trunk/drivers/char/tty_port.c b/trunk/drivers/char/tty_port.c
index 9769b1149f76..4e862a75f7ff 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 retval;
+	return 0;
 	
 }
 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 = {