diff options
Diffstat (limited to 'drivers/usb/gadget/serial.c')
-rw-r--r-- | drivers/usb/gadget/serial.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/usb/gadget/serial.c b/drivers/usb/gadget/serial.c index 433b3f44f42e..8d158e5640e3 100644 --- a/drivers/usb/gadget/serial.c +++ b/drivers/usb/gadget/serial.c | |||
@@ -170,7 +170,7 @@ static int gs_open(struct tty_struct *tty, struct file *file); | |||
170 | static void gs_close(struct tty_struct *tty, struct file *file); | 170 | static void gs_close(struct tty_struct *tty, struct file *file); |
171 | static int gs_write(struct tty_struct *tty, | 171 | static int gs_write(struct tty_struct *tty, |
172 | const unsigned char *buf, int count); | 172 | const unsigned char *buf, int count); |
173 | static void gs_put_char(struct tty_struct *tty, unsigned char ch); | 173 | static int gs_put_char(struct tty_struct *tty, unsigned char ch); |
174 | static void gs_flush_chars(struct tty_struct *tty); | 174 | static void gs_flush_chars(struct tty_struct *tty); |
175 | static int gs_write_room(struct tty_struct *tty); | 175 | static int gs_write_room(struct tty_struct *tty); |
176 | static int gs_chars_in_buffer(struct tty_struct *tty); | 176 | static int gs_chars_in_buffer(struct tty_struct *tty); |
@@ -883,14 +883,15 @@ exit: | |||
883 | /* | 883 | /* |
884 | * gs_put_char | 884 | * gs_put_char |
885 | */ | 885 | */ |
886 | static void gs_put_char(struct tty_struct *tty, unsigned char ch) | 886 | static int gs_put_char(struct tty_struct *tty, unsigned char ch) |
887 | { | 887 | { |
888 | unsigned long flags; | 888 | unsigned long flags; |
889 | struct gs_port *port = tty->driver_data; | 889 | struct gs_port *port = tty->driver_data; |
890 | int ret = 0; | ||
890 | 891 | ||
891 | if (port == NULL) { | 892 | if (port == NULL) { |
892 | pr_err("gs_put_char: NULL port pointer\n"); | 893 | pr_err("gs_put_char: NULL port pointer\n"); |
893 | return; | 894 | return 0; |
894 | } | 895 | } |
895 | 896 | ||
896 | gs_debug("gs_put_char: (%d,%p) char=0x%x, called from %p\n", | 897 | gs_debug("gs_put_char: (%d,%p) char=0x%x, called from %p\n", |
@@ -910,10 +911,11 @@ static void gs_put_char(struct tty_struct *tty, unsigned char ch) | |||
910 | goto exit; | 911 | goto exit; |
911 | } | 912 | } |
912 | 913 | ||
913 | gs_buf_put(port->port_write_buf, &ch, 1); | 914 | ret = gs_buf_put(port->port_write_buf, &ch, 1); |
914 | 915 | ||
915 | exit: | 916 | exit: |
916 | spin_unlock_irqrestore(&port->port_lock, flags); | 917 | spin_unlock_irqrestore(&port->port_lock, flags); |
918 | return ret; | ||
917 | } | 919 | } |
918 | 920 | ||
919 | /* | 921 | /* |