X-Git-Url: http://pilppa.org/gitweb/?a=blobdiff_plain;f=Documentation%2FDMA-mapping.txt;h=c74fec8c2351168d1329c527183f3a975234030e;hb=cadd486cfc838ead0ad899db129cff9f61ef4267;hp=d8347c1fd032a2db19dbdcf7808bccaf5b6248e7;hpb=97a34eb77c758ff7821c2d29b3b5a84299c93aa1;p=linux-2.6-omap-h63xx.git diff --git a/Documentation/DMA-mapping.txt b/Documentation/DMA-mapping.txt index d8347c1fd03..c74fec8c235 100644 --- a/Documentation/DMA-mapping.txt +++ b/Documentation/DMA-mapping.txt @@ -332,7 +332,7 @@ __get_free_pages (but takes size instead of a page order). If your driver needs regions sized smaller than a page, you may prefer using the pci_pool interface, described below. -The consistent DMA mapping interfaces, for non-NULL dev, will by +The consistent DMA mapping interfaces, for non-NULL pdev, will by default return a DMA address which is SAC (Single Address Cycle) addressable. Even if the device indicates (via PCI dma mask) that it may address the upper 32-bits and thus perform DAC cycles, consistent @@ -740,7 +740,7 @@ failure can be determined by: dma_addr_t dma_handle; dma_handle = pci_map_single(pdev, addr, size, direction); - if (pci_dma_mapping_error(dma_handle)) { + if (pci_dma_mapping_error(pdev, dma_handle)) { /* * reduce current DMA mapping usage, * delay and try again later or