patch-2.2.4 linux/drivers/misc/parport_ax.c
Next file: linux/drivers/misc/parport_ieee1284.c
Previous file: linux/drivers/macintosh/via-pmu.c
Back to the patch index
Back to the overall index
- Lines: 22
- Date:
Mon Mar 15 16:11:30 1999
- Orig file:
v2.2.3/linux/drivers/misc/parport_ax.c
- Orig date:
Fri Jan 8 22:36:06 1999
diff -u --recursive --new-file v2.2.3/linux/drivers/misc/parport_ax.c linux/drivers/misc/parport_ax.c
@@ -1,4 +1,4 @@
-/* $Id: parport_ax.c,v 1.14 1998/11/16 04:48:02 davem Exp $
+/* $Id: parport_ax.c,v 1.17 1999/01/20 06:18:54 davem Exp $
* Parallel-port routines for Sun Ultra/AX architecture
*
* Author: Eddie C. Dost <ecd@skynet.be>
@@ -220,13 +220,13 @@
/* FIXME check that resources are free */
int err;
- if (p->irq != PARPORT_IRQ_NONE)
+ if (p->irq != PARPORT_IRQ_NONE) {
if ((err = request_irq(p->irq, parport_ax_interrupt,
0, p->name, p)) != 0)
return err;
else
parport_ax_enable_irq(p);
-
+ }
request_region(p->base, p->size, p->name);
if (p->modes & PARPORT_MODE_PCECR)
request_region(p->base+0x400, 3, p->name);
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)