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/isicom.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/isicom.c')
| -rw-r--r-- | drivers/char/isicom.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/char/isicom.c b/drivers/char/isicom.c index ba72b616a..e99decb62 100644 --- a/drivers/char/isicom.c +++ b/drivers/char/isicom.c @@ -80,7 +80,7 @@ static void isicom_tx(unsigned long _data); static void isicom_start(struct tty_struct * tty); static unsigned char * tmp_buf = 0; -static struct semaphore tmp_buf_sem = MUTEX; +static DECLARE_MUTEX(tmp_buf_sem); /* baud index mappings from linux defns to isi */ @@ -870,7 +870,7 @@ static int isicom_setup_port(struct isi_port * port) static int block_til_ready(struct tty_struct * tty, struct file * filp, struct isi_port * port) { int do_clocal = 0, retval; - struct wait_queue wait = { current, NULL }; + DECLARE_WAITQUEUE(wait, current); /* block if port is in the process of being closed */ @@ -1858,7 +1858,8 @@ static int isicom_init(void) port->bh_tqueue.routine = isicom_bottomhalf; port->bh_tqueue.data = port; port->status = 0; - + init_waitqueue_head(&port->open_wait); + init_waitqueue_head(&port->close_wait); /* . . . */ } } |