diff options
Diffstat (limited to 'drivers/parport')
-rw-r--r-- | drivers/parport/parport_pc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/parport/parport_pc.c b/drivers/parport/parport_pc.c index 18e85ccdae67..9302b8fd7461 100644 --- a/drivers/parport/parport_pc.c +++ b/drivers/parport/parport_pc.c | |||
@@ -2371,8 +2371,10 @@ void parport_pc_unregister_port (struct parport *p) | |||
2371 | spin_lock(&ports_lock); | 2371 | spin_lock(&ports_lock); |
2372 | list_del_init(&priv->list); | 2372 | list_del_init(&priv->list); |
2373 | spin_unlock(&ports_lock); | 2373 | spin_unlock(&ports_lock); |
2374 | #if defined(CONFIG_PARPORT_PC_FIFO) && defined(HAS_DMA) | ||
2374 | if (p->dma != PARPORT_DMA_NONE) | 2375 | if (p->dma != PARPORT_DMA_NONE) |
2375 | free_dma(p->dma); | 2376 | free_dma(p->dma); |
2377 | #endif | ||
2376 | if (p->irq != PARPORT_IRQ_NONE) | 2378 | if (p->irq != PARPORT_IRQ_NONE) |
2377 | free_irq(p->irq, p); | 2379 | free_irq(p->irq, p); |
2378 | release_region(p->base, 3); | 2380 | release_region(p->base, 3); |
@@ -2380,14 +2382,12 @@ void parport_pc_unregister_port (struct parport *p) | |||
2380 | release_region(p->base + 3, p->size - 3); | 2382 | release_region(p->base + 3, p->size - 3); |
2381 | if (p->modes & PARPORT_MODE_ECP) | 2383 | if (p->modes & PARPORT_MODE_ECP) |
2382 | release_region(p->base_hi, 3); | 2384 | release_region(p->base_hi, 3); |
2383 | #ifdef CONFIG_PARPORT_PC_FIFO | 2385 | #if defined(CONFIG_PARPORT_PC_FIFO) && defined(HAS_DMA) |
2384 | #ifdef HAS_DMA | ||
2385 | if (priv->dma_buf) | 2386 | if (priv->dma_buf) |
2386 | pci_free_consistent(priv->dev, PAGE_SIZE, | 2387 | pci_free_consistent(priv->dev, PAGE_SIZE, |
2387 | priv->dma_buf, | 2388 | priv->dma_buf, |
2388 | priv->dma_handle); | 2389 | priv->dma_handle); |
2389 | #endif | 2390 | #endif |
2390 | #endif | ||
2391 | kfree (p->private_data); | 2391 | kfree (p->private_data); |
2392 | parport_put_port(p); | 2392 | parport_put_port(p); |
2393 | kfree (ops); /* hope no-one cached it */ | 2393 | kfree (ops); /* hope no-one cached it */ |