Merge tag '6.6-rc-smb3-client-fixes-part2' of git://git.samba.org/sfrench/cifs-2.6

[sfrench/cifs-2.6.git] / drivers / tty / goldfish.c

diff --git a/drivers/tty/goldfish.c b/drivers/tty/goldfish.c
index d02de3f0326fbbc2fa588cdc890e3f5a2b4cf4e6..4591f940b7a1511a807dc31141d8d4d179bd0d03 100644 (file)
--- a/drivers/tty/goldfish.c
+++ b/drivers/tty/goldfish.c
@@ -125,8 +125,7 @@ static void goldfish_tty_rw(struct goldfish_tty *qtty,
        }
 }
 
-static void goldfish_tty_do_write(int line, const char *buf,
-                                 unsigned int count)
+static void goldfish_tty_do_write(int line, const u8 *buf, unsigned int count)
 {
        struct goldfish_tty *qtty = &goldfish_ttys[line];
        unsigned long address = (unsigned long)(void *)buf;
@@ -186,8 +185,8 @@ static void goldfish_tty_hangup(struct tty_struct *tty)
        tty_port_hangup(tty->port);
 }
 
-static int goldfish_tty_write(struct tty_struct *tty, const unsigned char *buf,
-                                                               int count)
+static ssize_t goldfish_tty_write(struct tty_struct *tty, const u8 *buf,
+                                 size_t count)
 {
        goldfish_tty_do_write(tty->index, buf, count);
        return count;