Commit 4cd55ab1 authored by Alan Cox's avatar Alan Cox Committed by Linus Torvalds

usb gadget: switch to put_char returning int

Signed-off-by: default avatarAlan Cox <alan@redhat.com>
Acked-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
Acked-by: default avatarDavid Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 09a6ffa8
...@@ -170,7 +170,7 @@ static int gs_open(struct tty_struct *tty, struct file *file); ...@@ -170,7 +170,7 @@ static int gs_open(struct tty_struct *tty, struct file *file);
static void gs_close(struct tty_struct *tty, struct file *file); static void gs_close(struct tty_struct *tty, struct file *file);
static int gs_write(struct tty_struct *tty, static int gs_write(struct tty_struct *tty,
const unsigned char *buf, int count); const unsigned char *buf, int count);
static void gs_put_char(struct tty_struct *tty, unsigned char ch); static int gs_put_char(struct tty_struct *tty, unsigned char ch);
static void gs_flush_chars(struct tty_struct *tty); static void gs_flush_chars(struct tty_struct *tty);
static int gs_write_room(struct tty_struct *tty); static int gs_write_room(struct tty_struct *tty);
static int gs_chars_in_buffer(struct tty_struct *tty); static int gs_chars_in_buffer(struct tty_struct *tty);
...@@ -883,14 +883,15 @@ exit: ...@@ -883,14 +883,15 @@ exit:
/* /*
* gs_put_char * gs_put_char
*/ */
static void gs_put_char(struct tty_struct *tty, unsigned char ch) static int gs_put_char(struct tty_struct *tty, unsigned char ch)
{ {
unsigned long flags; unsigned long flags;
struct gs_port *port = tty->driver_data; struct gs_port *port = tty->driver_data;
int ret = 0;
if (port == NULL) { if (port == NULL) {
pr_err("gs_put_char: NULL port pointer\n"); pr_err("gs_put_char: NULL port pointer\n");
return; return 0;
} }
gs_debug("gs_put_char: (%d,%p) char=0x%x, called from %p\n", 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,10 +911,11 @@ static void gs_put_char(struct tty_struct *tty, unsigned char ch)
goto exit; goto exit;
} }
gs_buf_put(port->port_write_buf, &ch, 1); ret = gs_buf_put(port->port_write_buf, &ch, 1);
exit: exit:
spin_unlock_irqrestore(&port->port_lock, flags); spin_unlock_irqrestore(&port->port_lock, flags);
return ret;
} }
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment