diff --git a/[refs] b/[refs]
index 33cfa21433b9..7ffb9497a8cb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ab1a852128d6f0677999eecbf6d04bf9f6fe9a9a
+refs/heads/master: 63a59fa7a74fccff64dbf7d9230bd9d91bddead4
diff --git a/trunk/drivers/char/serial167.c b/trunk/drivers/char/serial167.c
index fd2db07a50fc..3b23270eaa65 100644
--- a/trunk/drivers/char/serial167.c
+++ b/trunk/drivers/char/serial167.c
@@ -1073,7 +1073,7 @@ static int cy_put_char(struct tty_struct *tty, unsigned char ch)
 		return 0;
 
 	if (!info->xmit_buf)
-		return;
+		return 0;
 
 	local_irq_save(flags);
 	if (info->xmit_cnt >= PAGE_SIZE - 1) {