---

yaml --- r: 155523 b: refs/heads/master c: 301d95c h: refs/heads/master i: 155521: 805fc64 155519: 2063217 v: v3
git-mirror · Jul 17, 2009 · 362df65 · 362df65
1 parent 4a86591
commit 362df65
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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 = {