patch-2.3.11 linux/drivers/misc/parport_pc.c

Next file: linux/drivers/misc/parport_share.c
Previous file: linux/drivers/misc/parport_init.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.10/linux/drivers/misc/parport_pc.c linux/drivers/misc/parport_pc.c
@@ -314,8 +314,7 @@
 
 void parport_pc_init_state(struct pardevice *dev, struct parport_state *s)
 {
-	struct parport_pc_private *priv = dev->port->physport->private_data;
-	priv->ctr = s->u.pc.ctr = 0xc | (dev->irq_func ? 0x10 : 0x0);
+	s->u.pc.ctr = 0xc | (dev->irq_func ? 0x10 : 0x0);
 	s->u.pc.ecr = 0x24;
 }
 
@@ -1377,7 +1376,8 @@
 
 static int __init irq_probe_ECP(struct parport *pb)
 {
-	int irqs, i;
+	int i;
+	unsigned long irqs;
 
 	sti();
 	irqs = probe_irq_on();

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)