2 files changed, 7 insertions, 4 deletions

diff --git a/drivers/char/mbcs.c b/drivers/char/mbcs.c
index acd8e9ed474a..87c67b42bc08 100644
--- a/drivers/char/mbcs.c
+++ b/drivers/char/mbcs.c
@@ -15,6 +15,7 @@
 #include <linux/moduleparam.h>
 #include <linux/types.h>
 #include <linux/ioport.h>
+#include <linux/kernel.h>
 #include <linux/notifier.h>
 #include <linux/reboot.h>
 #include <linux/init.h>
@@ -715,8 +716,8 @@ static ssize_t show_algo(struct device *dev, struct device_attribute *attr, char
          */
         debug0 = *(uint64_t *) soft->debug_addr;
 
-        return sprintf(buf, "0x%lx 0x%lx\n",
-                       (debug0 >> 32), (debug0 & 0xffffffff));
+        return sprintf(buf, "0x%x 0x%x\n",
+                       upper_32_bits(debug0), lower_32_bits(debug0));
 }
 
 static ssize_t store_algo(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
diff --git a/drivers/char/pty.c b/drivers/char/pty.c
index b33d6688e910..53761cefa915 100644
--- a/drivers/char/pty.c
+++ b/drivers/char/pty.c
@@ -120,8 +120,10 @@ static int pty_write(struct tty_struct *tty, const unsigned char *buf, int c)
                 /* Stuff the data into the input queue of the other end */
                 c = tty_insert_flip_string(to, buf, c);
                 /* And shovel */
-                tty_flip_buffer_push(to);
-                tty_wakeup(tty);
+                if (c) {
+                        tty_flip_buffer_push(to);
+                        tty_wakeup(tty);
+                }
         }
         return c;
 }