patch-2.3.1 linux/drivers/isdn/isdn_tty.c
Next file: linux/drivers/misc/parport_share.c
Previous file: linux/drivers/isdn/isdn_ppp.c
Back to the patch index
Back to the overall index
- Lines: 21
- Date:
Thu May 13 10:53:50 1999
- Orig file:
v2.3.0/linux/drivers/isdn/isdn_tty.c
- Orig date:
Sat Oct 31 10:37:14 1998
diff -u --recursive --new-file v2.3.0/linux/drivers/isdn/isdn_tty.c linux/drivers/isdn/isdn_tty.c
@@ -1567,8 +1567,7 @@
static int
isdn_tty_block_til_ready(struct tty_struct *tty, struct file *filp, modem_info * info)
{
- struct wait_queue wait =
- {current, NULL};
+ DECLARE_WAITQUEUE(wait, current);
int do_clocal = 0;
unsigned long flags;
int retval;
@@ -2004,8 +2003,8 @@
info->blocked_open = 0;
info->callout_termios = m->cua_modem.init_termios;
info->normal_termios = m->tty_modem.init_termios;
- info->open_wait = 0;
- info->close_wait = 0;
+ init_waitqueue_head(&info->open_wait);
+ init_waitqueue_head(&info->close_wait);
info->isdn_driver = -1;
info->isdn_channel = -1;
info->drv_index = -1;
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)