Skip to content

Commit

Permalink
amiserial: Switch put char to return success/fail
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Alan Cox authored and Linus Torvalds committed Apr 30, 2008
1 parent 4cd55ab commit 257afa3
Showing 1 changed file with 6 additions and 5 deletions.
11 changes: 6 additions & 5 deletions drivers/char/amiserial.c
Original file line number Diff line number Diff line change
Expand Up @@ -832,33 +832,34 @@ static void change_speed(struct async_struct *info,
local_irq_restore(flags);
}

static void rs_put_char(struct tty_struct *tty, unsigned char ch)
static int rs_put_char(struct tty_struct *tty, unsigned char ch)
{
struct async_struct *info;
unsigned long flags;

if (!tty)
return;
return 0;

info = tty->driver_data;

if (serial_paranoia_check(info, tty->name, "rs_put_char"))
return;
return 0;

if (!info->xmit.buf)
return;
return 0;

local_irq_save(flags);
if (CIRC_SPACE(info->xmit.head,
info->xmit.tail,
SERIAL_XMIT_SIZE) == 0) {
local_irq_restore(flags);
return;
return 0;
}

info->xmit.buf[info->xmit.head++] = ch;
info->xmit.head &= SERIAL_XMIT_SIZE-1;
local_irq_restore(flags);
return 1;
}

static void rs_flush_chars(struct tty_struct *tty)
Expand Down

0 comments on commit 257afa3

Please sign in to comment.