patch-2.4.20 linux-2.4.20/drivers/parport/parport_pc.c
Next file: linux-2.4.20/drivers/pci/Makefile
Previous file: linux-2.4.20/drivers/parport/parport_mfc3.c
Back to the patch index
Back to the overall index
- Lines: 23
- Date:
Thu Nov 28 15:53:14 2002
- Orig file:
linux-2.4.19/drivers/parport/parport_pc.c
- Orig date:
Fri Aug 2 17:39:44 2002
diff -urN linux-2.4.19/drivers/parport/parport_pc.c linux-2.4.20/drivers/parport/parport_pc.c
@@ -2409,7 +2409,9 @@
void parport_pc_unregister_port (struct parport *p)
{
+#ifdef CONFIG_PARPORT_PC_FIFO
struct parport_pc_private *priv = p->private_data;
+#endif /* CONFIG_PARPORT_PC_FIFO */
struct parport_operations *ops = p->ops;
if (p->dma != PARPORT_DMA_NONE)
free_dma(p->dma);
@@ -2421,10 +2423,12 @@
if (p->modes & PARPORT_MODE_ECP)
release_region(p->base_hi, 3);
parport_proc_unregister(p);
+#ifdef CONFIG_PARPORT_PC_FIFO
if (priv->dma_buf)
pci_free_consistent(priv->dev, PAGE_SIZE,
priv->dma_buf,
priv->dma_handle);
+#endif /* CONFIG_PARPORT_PC_FIFO */
kfree (p->private_data);
parport_unregister_port(p);
kfree (ops); /* hope no-one cached it */
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)