patch-2.1.126 linux/drivers/char/hfmodem/main.c

Next file: linux/drivers/char/istallion.c
Previous file: linux/drivers/char/esp.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.125/linux/drivers/char/hfmodem/main.c linux/drivers/char/hfmodem/main.c
@@ -148,14 +148,6 @@
 #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 @@
 		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;
 }

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov