Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7b51a70c authored by FUJITA Tomonori's avatar FUJITA Tomonori Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (9472): 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.

Signed-off-by: default avatarFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Acked-by: default avatarIgor M. Liplianin <liplianin@me.by>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 20dafb3b

drivers/media/dvb/dm1105/dm1105.c

+1 −1
Original line number Diff line number Diff line
@@ -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)