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: Ricardo Cerqueira <v4l@cerqueira.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

diff --git a/drivers/media/video/video-buf.c b/drivers/media/video/video-buf.c
index fb09c43c0333b70cca33f72041b79f2c3bb28b20..acc5ea936687a02ed7b52b049b2c894a828daa74 100644 (file)
--- a/drivers/media/video/video-buf.c
+++ b/drivers/media/video/video-buf.c
@@ -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));
 }