lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] parport_pc: arm build fix

Browse Source 
free_dma() isn't implemented on ARM unless HAS_DMA is set.

Cc: Russell King <rmk@arm.linux.org.uk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Andrew Morton
2006-01-08 01:05:05 -08:00
committed by Linus Torvalds
parent a771f2b82a
commit d1c4ac408f
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/parport/parport_pc.c
View File

@@ -2371,8 +2371,10 @@ void parport_pc_unregister_port (struct parport *p)
spin_lock(&ports_lock); spin_lock(&ports_lock);
list_del_init(&priv->list); list_del_init(&priv->list);
spin_unlock(&ports_lock); spin_unlock(&ports_lock);
#if defined(CONFIG_PARPORT_PC_FIFO) && defined(HAS_DMA)
if (p->dma != PARPORT_DMA_NONE) if (p->dma != PARPORT_DMA_NONE)
free_dma(p->dma); free_dma(p->dma);
#endif
if (p->irq != PARPORT_IRQ_NONE) if (p->irq != PARPORT_IRQ_NONE)
free_irq(p->irq, p); free_irq(p->irq, p);
release_region(p->base, 3); release_region(p->base, 3);
@@ -2380,13 +2382,11 @@ void parport_pc_unregister_port (struct parport *p)
release_region(p->base + 3, p->size - 3); release_region(p->base + 3, p->size - 3);
if (p->modes & PARPORT_MODE_ECP) if (p->modes & PARPORT_MODE_ECP)
release_region(p->base_hi, 3); release_region(p->base_hi, 3);
#ifdef CONFIG_PARPORT_PC_FIFO #if defined(CONFIG_PARPORT_PC_FIFO) && defined(HAS_DMA)
#ifdef HAS_DMA
if (priv->dma_buf) if (priv->dma_buf)
pci_free_consistent(priv->dev, PAGE_SIZE, pci_free_consistent(priv->dev, PAGE_SIZE,
priv->dma_buf, priv->dma_buf,
priv->dma_handle); priv->dma_handle);
#endif
#endif #endif
kfree (p->private_data); kfree (p->private_data);
parport_put_port(p); parport_put_port(p);