lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

specialix: Switch to int put_char method

Browse Source 
Signed-off-by: Alan Cox <alan@redhat.com>
Cc: Jiri Slaby <jirislaby@gmail.com>
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:07 -07:00
committed by Linus Torvalds
parent a5b08c6619
commit 6ae045767b
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/char/specialix.c
View File

@@ -1690,7 +1690,7 @@ static int sx_write(struct tty_struct * tty,
} }
static void sx_put_char(struct tty_struct * tty, unsigned char ch) static int sx_put_char(struct tty_struct * tty, unsigned char ch)
{ {
struct specialix_port *port = (struct specialix_port *)tty->driver_data; struct specialix_port *port = (struct specialix_port *)tty->driver_data;
unsigned long flags; unsigned long flags;
@@ -1700,12 +1700,12 @@ static void sx_put_char(struct tty_struct * tty, unsigned char ch)
if (sx_paranoia_check(port, tty->name, "sx_put_char")) { if (sx_paranoia_check(port, tty->name, "sx_put_char")) {
func_exit(); func_exit();
return; return 0;
} }
dprintk (SX_DEBUG_TX, "check tty: %p %p\n", tty, port->xmit_buf); dprintk (SX_DEBUG_TX, "check tty: %p %p\n", tty, port->xmit_buf);
if (!port->xmit_buf) { if (!port->xmit_buf) {
func_exit(); func_exit();
return; return 0;
} }
bp = port_Board(port); bp = port_Board(port);
spin_lock_irqsave(&port->lock, flags); spin_lock_irqsave(&port->lock, flags);
@@ -1715,7 +1715,7 @@ static void sx_put_char(struct tty_struct * tty, unsigned char ch)
spin_unlock_irqrestore(&port->lock, flags); spin_unlock_irqrestore(&port->lock, flags);
dprintk (SX_DEBUG_TX, "Exit size\n"); dprintk (SX_DEBUG_TX, "Exit size\n");
func_exit(); func_exit();
return; return 0;
} }
dprintk (SX_DEBUG_TX, "Handle xmit: %p %p\n", port, port->xmit_buf); dprintk (SX_DEBUG_TX, "Handle xmit: %p %p\n", port, port->xmit_buf);
port->xmit_buf[port->xmit_head++] = ch; port->xmit_buf[port->xmit_head++] = ch;
@@ -1724,6 +1724,7 @@ static void sx_put_char(struct tty_struct * tty, unsigned char ch)
spin_unlock_irqrestore(&port->lock, flags); spin_unlock_irqrestore(&port->lock, flags);
func_exit(); func_exit();
return 1;
} }