diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-06-17 13:25:08 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-06-17 13:25:08 +0000 |
| commit | 59223edaa18759982db0a8aced0e77457d10c68e (patch) | |
| tree | 89354903b01fa0a447bffeefe00df3044495db2e /drivers/char/epca.c | |
| parent | db7d4daea91e105e3859cf461d7e53b9b77454b2 (diff) | |
Merge with Linux 2.3.6. Sorry, this isn't tested on silicon, I don't
have a MIPS box at hand.
Diffstat (limited to 'drivers/char/epca.c')
| -rw-r--r-- | drivers/char/epca.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/char/epca.c b/drivers/char/epca.c index e1d2cd2f7..abb8c5f35 100644 --- a/drivers/char/epca.c +++ b/drivers/char/epca.c @@ -1268,7 +1268,7 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp, struct channel *ch) { /* Begin block_til_ready */ - struct wait_queue wait = {current, NULL}; + DECLARE_WAITQUEUE(wait,current); int retval, do_clocal = 0; unsigned long flags; @@ -2236,8 +2236,8 @@ static void post_fep_init(unsigned int crd) ch->blocked_open = 0; ch->callout_termios = pc_callout.init_termios; ch->normal_termios = pc_driver.init_termios; - ch->open_wait = 0; - ch->close_wait = 0; + init_waitqueue_head(&ch->open_wait); + init_waitqueue_head(&ch->close_wait); ch->tmp_buf = kmalloc(ch->txbufsize,GFP_KERNEL); if (!(ch->tmp_buf)) { |