Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6

[firefly-linux-kernel-4.4.55.git] / drivers / misc / ti-st / st_core.c

diff --git a/drivers/misc/ti-st/st_core.c b/drivers/misc/ti-st/st_core.c
index f91f82eabda72a311602a8979ab835e0d938ffd6..1a05fe08e2cb7dc4462b76d360115e725321fc7e 100644 (file)
--- a/drivers/misc/ti-st/st_core.c
+++ b/drivers/misc/ti-st/st_core.c
@@ -747,8 +747,8 @@ static void st_tty_close(struct tty_struct *tty)
        pr_debug("%s: done ", __func__);
 }
 
-static void st_tty_receive(struct tty_struct *tty, const unsigned char *data,
-                          char *tty_flags, int count)
+static unsigned int st_tty_receive(struct tty_struct *tty,
+               const unsigned char *data, char *tty_flags, int count)
 {
 #ifdef VERBOSE
        print_hex_dump(KERN_DEBUG, ">in>", DUMP_PREFIX_NONE,
@@ -761,6 +761,8 @@ static void st_tty_receive(struct tty_struct *tty, const unsigned char *data,
         */
        st_recv(tty->disc_data, data, count);
        pr_debug("done %s", __func__);
+
+       return count;
 }
 
 /* wake-up function called in from the TTY layer