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

• Lines: 26
• Date: Fri Oct 9 12:20:27 1998
• Orig file: v2.1.125/linux/drivers/net/hamradio/baycom_par.c
• Orig date: Tue Jun 9 11:57:29 1998

diff -u --recursive --new-file v2.1.125/linux/drivers/net/hamradio/baycom_par.c linux/drivers/net/hamradio/baycom_par.c
@@ -357,14 +357,6 @@
 
 /* --------------------------------------------------------------------- */
 
-static int par96_preempt(void *handle)
-{
-	/* we cannot relinquish the port in the middle of an operation */
-	return 1;
-}
-
-/* --------------------------------------------------------------------- */
-
 static void par96_wakeup(void *handle)
 {
         struct device *dev = (struct device *)handle;
@@ -396,8 +388,8 @@
 	}
 	memset(&bc->modem, 0, sizeof(bc->modem));
 	bc->hdrv.par.bitrate = 9600;
-	if (!(bc->pdev = parport_register_device(pp, dev->name, par96_preempt, par96_wakeup, 
-						 par96_interrupt, PARPORT_DEV_LURK, dev))) {
+	if (!(bc->pdev = parport_register_device(pp, dev->name, NULL, par96_wakeup, 
+						 par96_interrupt, PARPORT_DEV_EXCL, dev))) {
 		printk(KERN_ERR "baycom_par: cannot register parport at 0x%lx\n", pp->base);
 		return -ENXIO;
 	}