V4L/DVB (9472): dm1105: fix the misuse of pci_dma_mapping_error
authorFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Fri, 24 Oct 2008 09:13:23 +0000 (06:13 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Mon, 29 Dec 2008 19:53:24 +0000 (17:53 -0200)
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.

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Acked-by: Igor M. Liplianin <liplianin@me.by>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/dvb/dm1105/dm1105.c

index 5c16437d989dd57107ac5f22d07ca37e017780e7..f48f73aff195ae7d60a918288d15027983a62a8a 100644 (file)
@@ -367,7 +367,7 @@ static int __devinit dm1105dvb_dma_map(struct dm1105dvb *dm1105dvb)
 {
        dm1105dvb->ts_buf = pci_alloc_consistent(dm1105dvb->pdev, 6*DM1105_DMA_BYTES, &dm1105dvb->dma_addr);
 
-       return pci_dma_mapping_error(dm1105dvb->pdev, dm1105dvb->dma_addr);
+       return !dm1105dvb->ts_buf;
 }
 
 static void dm1105dvb_dma_unmap(struct dm1105dvb *dm1105dvb)