summaryrefslogtreecommitdiffstats
path: root/drivers/char/hfmodem
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>1999-06-17 13:25:08 +0000
committerRalf Baechle <ralf@linux-mips.org>1999-06-17 13:25:08 +0000
commit59223edaa18759982db0a8aced0e77457d10c68e (patch)
tree89354903b01fa0a447bffeefe00df3044495db2e /drivers/char/hfmodem
parentdb7d4daea91e105e3859cf461d7e53b9b77454b2 (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/hfmodem')
-rw-r--r--drivers/char/hfmodem/main.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/char/hfmodem/main.c b/drivers/char/hfmodem/main.c
index 20347f32c..6af834fce 100644
--- a/drivers/char/hfmodem/main.c
+++ b/drivers/char/hfmodem/main.c
@@ -638,6 +638,7 @@ __initfunc(int init_module(void))
hfmodem_state[0].ptt_out.seriobase = serio;
hfmodem_state[0].ptt_out.pariobase = pario;
hfmodem_state[0].ptt_out.midiiobase = midiio;
+ init_waitqueue_head(&hfmodem_state[0].wait);
hfmodem_refclock_probe();
output_check(&hfmodem_state[0]);
#if defined(CONFIG_HFMODEM_WSS) && defined(CONFIG_HFMODEM_SBC)
@@ -703,7 +704,8 @@ __initfunc(void hfmodem_init(void))
int i;
printk(hfmodem_drvinfo);
- hfmodem_refclock_probe();
+ init_waitqueue_head(&hfmode_state[0].wait);
+ hfmodem_refclock_probe();
output_check(&hfmodem_state[0]);
#if defined(CONFIG_HFMODEM_WSS) && defined(CONFIG_HFMODEM_SBC)
if (hw)