git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
iwlwifi: memory allocation optimization
[safe/jmp/linux-2.6]
/
drivers
/
char
/
amiserial.c
diff --git
a/drivers/char/amiserial.c
b/drivers/char/amiserial.c
index
a5f3956
..
3530ff4
100644
(file)
--- a/
drivers/char/amiserial.c
+++ b/
drivers/char/amiserial.c
@@
-832,33
+832,34
@@
static void change_speed(struct async_struct *info,
local_irq_restore(flags);
}
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)
{
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"))
info = tty->driver_data;
if (serial_paranoia_check(info, tty->name, "rs_put_char"))
- return;
+ return
0
;
if (!info->xmit.buf)
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);
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);
}
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)
}
static void rs_flush_chars(struct tty_struct *tty)
@@
-1247,7
+1248,7
@@
static int rs_tiocmset(struct tty_struct *tty, struct file *file,
/*
* rs_break() --- routine which turns the break handling on or off
*/
/*
* rs_break() --- routine which turns the break handling on or off
*/
-static
void
rs_break(struct tty_struct *tty, int break_state)
+static
int
rs_break(struct tty_struct *tty, int break_state)
{
struct async_struct * info = (struct async_struct *)tty->driver_data;
unsigned long flags;
{
struct async_struct * info = (struct async_struct *)tty->driver_data;
unsigned long flags;
@@
-1262,6
+1263,7
@@
static void rs_break(struct tty_struct *tty, int break_state)
custom.adkcon = AC_UARTBRK;
mb();
local_irq_restore(flags);
custom.adkcon = AC_UARTBRK;
mb();
local_irq_restore(flags);
+ return 0;
}
}