aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlan Cox <alan@lxorguk.ukuu.org.uk>2008-04-30 03:54:01 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-04-30 11:29:45 -0400
commit4cd55ab1f991e4d4f3551a711f0f87441a57cd1b (patch)
treef503b9bdb96008dbe47365cde49cdd0ce3f945ac
parent09a6ffa84c8e893d9656296b322dc8145e09e186 (diff)
usb gadget: switch to put_char returning int
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>
-rw-r--r--drivers/usb/gadget/serial.c10
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);
170static void gs_close(struct tty_struct *tty, struct file *file); 170static void gs_close(struct tty_struct *tty, struct file *file);
171static int gs_write(struct tty_struct *tty, 171static int gs_write(struct tty_struct *tty,
172 const unsigned char *buf, int count); 172 const unsigned char *buf, int count);
173static void gs_put_char(struct tty_struct *tty, unsigned char ch); 173static int gs_put_char(struct tty_struct *tty, unsigned char ch);
174static void gs_flush_chars(struct tty_struct *tty); 174static void gs_flush_chars(struct tty_struct *tty);
175static int gs_write_room(struct tty_struct *tty); 175static int gs_write_room(struct tty_struct *tty);
176static int gs_chars_in_buffer(struct tty_struct *tty); 176static 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 */
886static void gs_put_char(struct tty_struct *tty, unsigned char ch) 886static 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
915exit: 916exit:
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/*