diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-02-24 00:12:35 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-02-24 00:12:35 +0000 |
| commit | 482368b1a8e45430672c58c9a42e7d2004367126 (patch) | |
| tree | ce2a1a567d4d62dee7c2e71a46a99cf72cf1d606 /drivers/parport | |
| parent | e4d0251c6f56ab2e191afb70f80f382793e23f74 (diff) | |
Merge with 2.3.47. Guys, this is buggy as shit. You've been warned.
Diffstat (limited to 'drivers/parport')
| -rw-r--r-- | drivers/parport/parport_pc.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/parport/parport_pc.c b/drivers/parport/parport_pc.c index 29206729a..beb0a68b7 100644 --- a/drivers/parport/parport_pc.c +++ b/drivers/parport/parport_pc.c @@ -561,7 +561,8 @@ static size_t parport_pc_fifo_write_block_dma (struct parport *port, if ((start ^ end) & ~0xffffUL) maxlen = (0x10000 - start) & 0xffff; - dma_addr = dma_handle = pci_map_single(priv->dev, (void *)buf, length); + dma_addr = dma_handle = pci_map_single(priv->dev, (void *)buf, length, + PCI_DMA_TODEVICE); } else { /* above 16 MB we use a bounce buffer as ISA-DMA is not possible */ maxlen = PAGE_SIZE; /* sizeof(priv->dma_buf) */ @@ -661,7 +662,7 @@ static size_t parport_pc_fifo_write_block_dma (struct parport *port, frob_econtrol (port, 1<<3, 0); if (dma_handle) - pci_unmap_single(priv->dev, dma_handle, length); + pci_unmap_single(priv->dev, dma_handle, length, PCI_DMA_TODEVICE); return length - left; } |