The patch number 9472 was added via Mauro Carvalho Chehab <[EMAIL PROTECTED]>
to http://linuxtv.org/hg/v4l-dvb master development tree.
Kernel patches in this development tree may be modified to be backward
compatible with older kernels. Compatibility modifications will be
removed before inclusion into the mainstream Kernel
If anyone has any objections, please let us know by sending a message to:
[EMAIL PROTECTED]
------
From: FUJITA Tomonori <[EMAIL PROTECTED]>
dm1105: fix the misuse of pci_dma_mapping_error
pci_dma_mapping_error can't be used for pci_alloc_consistent
(pci_dma_mapping_error is for dma_map_single and dma_map_page).
pci_alloc_consistent returns NULL if the allocation fails.
Acked-by: Igor M. Liplianin <[EMAIL PROTECTED]>
Signed-off-by: FUJITA Tomonori <[EMAIL PROTECTED]>
Signed-off-by: Mauro Carvalho Chehab <[EMAIL PROTECTED]>
---
linux/drivers/media/dvb/dm1105/dm1105.c | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff -r 8486cbf6af4e -r 76ded145bab1 linux/drivers/media/dvb/dm1105/dm1105.c
--- a/linux/drivers/media/dvb/dm1105/dm1105.c Sun Oct 26 21:25:21 2008 -0200
+++ b/linux/drivers/media/dvb/dm1105/dm1105.c Fri Oct 24 09:13:23 2008 +0000
@@ -367,11 +367,7 @@ static int __devinit dm1105dvb_dma_map(s
{
dm1105dvb->ts_buf = pci_alloc_consistent(dm1105dvb->pdev,
6*DM1105_DMA_BYTES, &dm1105dvb->dma_addr);
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 27)
- return pci_dma_mapping_error(dm1105dvb->dma_addr);
-#else
- return pci_dma_mapping_error(dm1105dvb->pdev, dm1105dvb->dma_addr);
-#endif
+ return !dm1105dvb->ts_buf;
}
static void dm1105dvb_dma_unmap(struct dm1105dvb *dm1105dvb)
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/76ded145bab12ee5eaed22acfae166475a393bde
_______________________________________________
linuxtv-commits mailing list
[email protected]
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
