lkml.org 
[lkml]   [2008]   [Apr]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[PATCH] serial167: switch to int put_char method
Signed-off-by: Alan Cox <alan@redhat.com>

diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.25-rc8-mm2/drivers/char/serial167.c linux-2.6.25-rc8-mm2/drivers/char/serial167.c
--- linux.vanilla-2.6.25-rc8-mm2/drivers/char/serial167.c 2008-04-13 15:36:53.000000000 +0100
+++ linux-2.6.25-rc8-mm2/drivers/char/serial167.c 2008-04-13 15:41:05.000000000 +0100
@@ -1060,7 +1060,7 @@

} /* config_setup */

-static void cy_put_char(struct tty_struct *tty, unsigned char ch)
+static int cy_put_char(struct tty_struct *tty, unsigned char ch)
{
struct cyclades_port *info = (struct cyclades_port *)tty->driver_data;
unsigned long flags;
@@ -1070,7 +1070,7 @@
#endif

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

if (!info->xmit_buf)
return;
@@ -1078,13 +1078,14 @@
local_irq_save(flags);
if (info->xmit_cnt >= PAGE_SIZE - 1) {
local_irq_restore(flags);
- return;
+ return 0;
}

info->xmit_buf[info->xmit_head++] = ch;
info->xmit_head &= PAGE_SIZE - 1;
info->xmit_cnt++;
local_irq_restore(flags);
+ return 1;
} /* cy_put_char */

static void cy_flush_chars(struct tty_struct *tty)

\
 
 \ /
  Last update: 2008-04-13 19:23    [W:0.022 / U:0.056 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site