patch-2.1.126 linux/drivers/net/hamradio/baycom_epp.c

• Lines: 26
• Date: Fri Oct 9 12:20:27 1998
• Orig file: v2.1.125/linux/drivers/net/hamradio/baycom_epp.c
• Orig date: Tue Jul 21 00:15:31 1998

diff -u --recursive --new-file v2.1.125/linux/drivers/net/hamradio/baycom_epp.c linux/drivers/net/hamradio/baycom_epp.c
@@ -1010,14 +1010,6 @@
 
 /* --------------------------------------------------------------------- */
 
-static int epp_preempt(void *handle)
-{
-        /* we cannot relinquish the port in the middle of an operation */
-        return 1;
-}
-
-/* --------------------------------------------------------------------- */
-
 static void epp_wakeup(void *handle)
 {
         struct device *dev = (struct device *)handle;
@@ -1070,8 +1062,8 @@
         }
 #endif
 	memset(&bc->modem, 0, sizeof(bc->modem));
-        if (!(bc->pdev = parport_register_device(pp, dev->name, epp_preempt, epp_wakeup, 
-                                                 epp_interrupt, PARPORT_DEV_LURK, dev))) {
+        if (!(bc->pdev = parport_register_device(pp, dev->name, NULL, epp_wakeup, 
+                                                 epp_interrupt, PARPORT_DEV_EXCL, dev))) {
                 printk(KERN_ERR "%s: cannot register parport at 0x%lx\n", bc_drvname, pp->base);
                 return -ENXIO;
         }