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

Commit 731f902e authored by Ricardo Cerqueira's avatar Ricardo Cerqueira Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (3620): Fix video-buf PCI wrappers 



After the recent video-buf "generic" adaptation, the PCI wrappers got
completely broken, and all of the DMA sound modules stopped working (and
failed with an oops)

Signed-off-by: default avatarRicardo Cerqueira <v4l@cerqueira.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 8dbc5ece

drivers/media/video/video-buf.c

+9 −3
Original line number Diff line number Diff line
@@ -399,19 +399,25 @@ void videobuf_queue_pci(struct videobuf_queue* q) 
int videobuf_pci_dma_map(struct pci_dev *pci,struct videobuf_dmabuf *dma)

{

	struct videobuf_queue q;

	struct videobuf_queue_ops qops;



	q.dev=pci;

	q.ops->vb_map_sg=(vb_map_sg_t *)pci_unmap_sg;

	qops.vb_map_sg=(vb_map_sg_t *)pci_map_sg;

	qops.vb_unmap_sg=(vb_map_sg_t *)pci_unmap_sg;

	q.ops = &qops;



	return (videobuf_dma_unmap(&q,dma));

	return (videobuf_dma_map(&q,dma));

}



int videobuf_pci_dma_unmap(struct pci_dev *pci,struct videobuf_dmabuf *dma)

{

	struct videobuf_queue q;

	struct videobuf_queue_ops qops;



	q.dev=pci;

	q.ops->vb_map_sg=(vb_map_sg_t *)pci_unmap_sg;

	qops.vb_map_sg=(vb_map_sg_t *)pci_map_sg;

	qops.vb_unmap_sg=(vb_map_sg_t *)pci_unmap_sg;

	q.ops = &qops;



	return (videobuf_dma_unmap(&q,dma));

}