Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit d1c4ac408fbab78a5f89ff583b68d2d11b421bb3

Authored by Andrew Morton
Committed by Linus Torvalds
1 parent a771f2b82a
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[PATCH] parport_pc: arm build fix 

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>

Showing 1 changed file with 3 additions and 3 deletions Side-by-side Diff

drivers/parport/parport_pc.c
Diff comments   View file @ d1c4ac4
... ... @@ -2371,8 +2371,10 @@
2371 2371 spin_lock(&ports_lock);
2372 2372 list_del_init(&priv->list);
2373 2373 spin_unlock(&ports_lock);
  2374 +#if defined(CONFIG_PARPORT_PC_FIFO) && defined(HAS_DMA)
2374 2375 if (p->dma != PARPORT_DMA_NONE)
2375 2376 free_dma(p->dma);
  2377 +#endif
2376 2378 if (p->irq != PARPORT_IRQ_NONE)
2377 2379 free_irq(p->irq, p);
2378 2380 release_region(p->base, 3);
2379 2381  
... ... @@ -2380,13 +2382,11 @@
2380 2382 release_region(p->base + 3, p->size - 3);
2381 2383 if (p->modes & PARPORT_MODE_ECP)
2382 2384 release_region(p->base_hi, 3);
2383   -#ifdef CONFIG_PARPORT_PC_FIFO
2384   -#ifdef HAS_DMA
  2385 +#if defined(CONFIG_PARPORT_PC_FIFO) && defined(HAS_DMA)
2385 2386 if (priv->dma_buf)
2386 2387 pci_free_consistent(priv->dev, PAGE_SIZE,
2387 2388 priv->dma_buf,
2388 2389 priv->dma_handle);
2389   -#endif
2390 2390 #endif
2391 2391 kfree (p->private_data);
2392 2392 parport_put_port(p);