diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-01-04 16:03:48 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-01-04 16:03:48 +0000 |
| commit | 78c388aed2b7184182c08428db1de6c872d815f5 (patch) | |
| tree | 4b2003b1b4ceb241a17faa995da8dd1004bb8e45 /drivers/char/hfmodem | |
| parent | eb7a5bf93aaa4be1d7c6181100ab7639e74d67f7 (diff) | |
Merge with Linux 2.1.131 and more MIPS goodies.
(Did I mention that CVS is buggy ...)
Diffstat (limited to 'drivers/char/hfmodem')
| -rw-r--r-- | drivers/char/hfmodem/main.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/drivers/char/hfmodem/main.c b/drivers/char/hfmodem/main.c index de5ed5cc2..d940bd232 100644 --- a/drivers/char/hfmodem/main.c +++ b/drivers/char/hfmodem/main.c @@ -148,14 +148,6 @@ struct hfmodem_state hfmodem_state[NR_DEVICE]; #define SP_PAR 2 #define SP_MIDI 4 -/* ---------------------------------------------------------------------- */ - -static int parptt_preempt(void *handle) -{ - /* we cannot relinquish the port in the middle of an operation */ - return 1; -} - /* --------------------------------------------------------------------- */ static void parptt_wakeup(void *handle) @@ -176,8 +168,8 @@ __initfunc(static int check_lpt(struct hfmodem_state *dev, unsigned int iobase)) pp = pp->next; if (!pp) return 0; - if (!(dev->ptt_out.pardev = parport_register_device(pp, hfmodem_drvname, parptt_preempt, parptt_wakeup, - NULL, PARPORT_DEV_LURK, dev))) + if (!(dev->ptt_out.pardev = parport_register_device(pp, hfmodem_drvname, NULL, parptt_wakeup, + NULL, PARPORT_DEV_EXCL, dev))) return 0; return 1; } |