summaryrefslogtreecommitdiffstats
path: root/drivers/char/hvsi.c
diff options
context:
space:
mode:
authorLinas Vepstas <linas@austin.ibm.com>2006-08-05 21:14:39 +0200
committerLinus Torvalds <torvalds@g5.osdl.org>2006-08-06 17:57:48 +0200
commit64e0cc38b69b8d43ab9793f50e4bb09cea0e6bb9 (patch)
tree734381fd5c4db5a3a79db114603d0900980bb14c /drivers/char/hvsi.c
parent[PATCH] pSeries hvsi char driver null pointer deref (diff)
downloadlinux-64e0cc38b69b8d43ab9793f50e4bb09cea0e6bb9.tar.xz
linux-64e0cc38b69b8d43ab9793f50e4bb09cea0e6bb9.zip
[PATCH] pSeries: hvsi char driver janitorial cleanup
A set of tty line discipline cleanup patches were introduced before the dawn of time, in kernel version 2.4.21. This patch performs that cleanup for the hvsi driver. The hvsi driver is used only on IBM pSeries PowerPC boxes. The driver was originally written by Hollis Blanchard, who has delegated maintainership to me. So this my first and maybe only patch in this official new role, because this driver is otherwise bug-free :-) Alan: "Actually its also a bug fix, tty->ldisc should be locked by refcounting and the helpers do this for you." Signed-off-by: Linas Vepstas <linas@austin.ibm.com> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Paul Mackerras <paulus@samba.org> Acked-by: Alan Cox <alan@redhat.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/char/hvsi.c')
-rw-r--r--drivers/char/hvsi.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/char/hvsi.c b/drivers/char/hvsi.c
index 54cbb58b8740..017f755632a3 100644
--- a/drivers/char/hvsi.c
+++ b/drivers/char/hvsi.c
@@ -987,10 +987,7 @@ static void hvsi_write_worker(void *arg)
start_j = 0;
#endif /* DEBUG */
wake_up_all(&hp->emptyq);
- if (test_bit(TTY_DO_WRITE_WAKEUP, &hp->tty->flags)
- && hp->tty->ldisc.write_wakeup)
- hp->tty->ldisc.write_wakeup(hp->tty);
- wake_up_interruptible(&hp->tty->write_wait);
+ tty_wakeup(hp->tty);
}
out: