git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.3
[linux-2.6.git]
/
drivers
/
s390
/
char
/
con3215.c
diff --git
a/drivers/s390/char/con3215.c
b/drivers/s390/char/con3215.c
index
0e724c8
..
9c72ffb
100644
(file)
--- a/
drivers/s390/char/con3215.c
+++ b/
drivers/s390/char/con3215.c
@@
-366,10
+366,7
@@
raw3215_tasklet(void *data)
tty = raw->tty;
if (tty != NULL &&
RAW3215_BUFFER_SIZE - raw->count >= RAW3215_MIN_SPACE) {
tty = raw->tty;
if (tty != NULL &&
RAW3215_BUFFER_SIZE - raw->count >= RAW3215_MIN_SPACE) {
- if ((tty->flags & (1 << TTY_DO_WRITE_WAKEUP)) &&
- tty->ldisc.write_wakeup)
- (tty->ldisc.write_wakeup)(tty);
- wake_up_interruptible(&tty->write_wait);
+ tty_wakeup(tty);
}
}
}
}
@@
-1002,7
+999,8
@@
tty3215_write(struct tty_struct * tty, int from_user,
ret = 0;
while (count > 0) {
length = count < 80 ? count : 80;
ret = 0;
while (count > 0) {
length = count < 80 ? count : 80;
- length -= copy_from_user(raw->ubuffer, buf, length);
+ length -= copy_from_user(raw->ubuffer,
+ (const unsigned char __user *)buf, length);
if (length == 0) {
if (!ret)
ret = -EFAULT;
if (length == 0) {
if (!ret)
ret = -EFAULT;
@@
-1054,10
+1052,7
@@
tty3215_flush_buffer(struct tty_struct *tty)
raw = (struct raw3215_info *) tty->driver_data;
raw3215_flush_buffer(raw);
raw = (struct raw3215_info *) tty->driver_data;
raw3215_flush_buffer(raw);
- wake_up_interruptible(&tty->write_wait);
- if ((tty->flags & (1 << TTY_DO_WRITE_WAKEUP)) &&
- tty->ldisc.write_wakeup)
- (tty->ldisc.write_wakeup)(tty);
+ tty_wakeup(tty);
}
/*
}
/*