Messages in this thread | | | From | David Brownell <> | Subject | Re: [PATCH] usb gadget: switch to put_char returning int | Date | Sun, 13 Apr 2008 10:21:42 -0700 |
| |
On Sunday 13 April 2008, Alan Cox wrote: > Signed-off-by: Alan Cox <alan@redhat.com>
ACK.
> diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.25-rc8-mm2/drivers/usb/gadget/serial.c linux-2.6.25-rc8-mm2/drivers/usb/gadget/serial.c > --- linux.vanilla-2.6.25-rc8-mm2/drivers/usb/gadget/serial.c 2008-04-13 15:36:54.000000000 +0100 > +++ linux-2.6.25-rc8-mm2/drivers/usb/gadget/serial.c 2008-04-13 15:41:09.000000000 +0100 > @@ -170,7 +170,7 @@ > 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 @@ > /* > * 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 @@ > 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; > } > > /* > -- > To unsubscribe from this list: send the line "unsubscribe linux-usb" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html >
| |