diff --git a/[refs] b/[refs]
index 3bf89bb87428..4ea9e8258694 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2e4f40d2eb763a17c75c07fff605402737260c59
+refs/heads/master: 970a8a513c30a1c3e8995609a153658a34bc02bf
diff --git a/trunk/drivers/char/amiserial.c b/trunk/drivers/char/amiserial.c
index 3530ff417a51..6e763e3f5a81 100644
--- a/trunk/drivers/char/amiserial.c
+++ b/trunk/drivers/char/amiserial.c
@@ -1254,7 +1254,7 @@ static int rs_break(struct tty_struct *tty, int break_state)
 	unsigned long flags;
 
 	if (serial_paranoia_check(info, tty->name, "rs_break"))
-		return;
+		return -EINVAL;
 
 	local_irq_save(flags);
 	if (break_state == -1)