renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-20 11:13:58 +08:00
Code

usb gadget: switch to put_char returning int

Browse Source 
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>
This commit is contained in:
Alan Cox 2008-04-30 00:54:01 -07:00 committed by Linus Torvalds
parent 09a6ffa84c
commit 4cd55ab1f9
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/usb/gadget/serial.c
View 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 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);
@ -883,14 +883,15 @@ exit:
/*
* 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",
@ -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;
}
/*