patch-2.1.70 linux/drivers/misc/parport_share.c

Next file: linux/drivers/pnp/parport_probe.c
Previous file: linux/drivers/char/tty_io.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.69/linux/drivers/misc/parport_share.c linux/drivers/misc/parport_share.c
@@ -279,7 +279,7 @@
 
 	/* Swap the IRQ handlers. */
 	if (dev->port->irq != PARPORT_IRQ_NONE) {
-		free_irq(dev->port->irq, dev->port);
+		free_irq(dev->port->irq, pd1?pd1->private:NULL);
 		request_irq(dev->port->irq, dev->irq_func ? dev->irq_func :
 			    parport_null_intr_func, SA_INTERRUPT, dev->name,
 			    dev->private);
@@ -307,7 +307,7 @@
 
 	/* Point IRQs somewhere harmless. */
 	if (dev->port->irq != PARPORT_IRQ_NONE) {
-		free_irq(dev->port->irq, dev->port);
+		free_irq(dev->port->irq, dev->private);
 		request_irq(dev->port->irq, parport_null_intr_func,
 			    SA_INTERRUPT, dev->port->name, NULL);
  	}

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