Skip to content

Commit

Permalink
usb gadget: switch to put_char returning int
Browse files Browse the repository at this point in the history
Signed-off-by: Alan Cox <alan@redhat.com>
Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
Acked-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Alan Cox authored and Linus Torvalds committed Apr 30, 2008
1 parent 09a6ffa commit 4cd55ab
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions drivers/usb/gadget/serial.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 int gs_write(struct tty_struct *tty,
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 int gs_write_room(struct tty_struct *tty);
static int gs_chars_in_buffer(struct tty_struct *tty);
Expand Down Expand Up @@ -883,14 +883,15 @@ static int gs_write(struct tty_struct *tty, const unsigned char *buf, int count)
/*
* 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;
struct gs_port *port = tty->driver_data;
int ret = 0;

if (port == NULL) {
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",
Expand All @@ -910,10 +911,11 @@ static void gs_put_char(struct tty_struct *tty, unsigned char ch)
goto exit;
}

gs_buf_put(port->port_write_buf, &ch, 1);
ret = gs_buf_put(port->port_write_buf, &ch, 1);

exit:
spin_unlock_irqrestore(&port->port_lock, flags);
return ret;
}

/*
Expand Down

0 comments on commit 4cd55ab

Please sign in to comment.