diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-10-08 12:20:02 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-10-10 00:03:14 -0300 |
| commit | d4cae5a50021271b9ef4e5e39e71e177d12fa8cb (patch) | |
| tree | 75f3def69e6b35fc02e46af5661bb45aa006ba9d /drivers/media/video/videobuf-dma-sg.c | |
| parent | d5f1b01644b6fd5e9eb480a4762cd6b569cb1246 (diff) | |
| download | talos-op-linux-d4cae5a50021271b9ef4e5e39e71e177d12fa8cb.tar.gz talos-op-linux-d4cae5a50021271b9ef4e5e39e71e177d12fa8cb.zip | |
V4L/DVB (6292): videobuf_core init always require callback implementation
In the past, videobuf_queue_init were used to initialize PCI DMA videobuffers.
This patch renames it, to avoid confusion with the previous kernel API, doing:
s/videobuf_queue_init/void videobuf_queue_core_init/
Also, the operations is now part of the function parameter. The function will
also add a test if this is defined, otherwise producing BUG.
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/videobuf-dma-sg.c')
| -rw-r--r-- | drivers/media/video/videobuf-dma-sg.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/videobuf-dma-sg.c b/drivers/media/video/videobuf-dma-sg.c index a38efe10feb4..8bb7fdd306d6 100644 --- a/drivers/media/video/videobuf-dma-sg.c +++ b/drivers/media/video/videobuf-dma-sg.c @@ -695,8 +695,8 @@ void videobuf_queue_pci_init(struct videobuf_queue* q, unsigned int msize, void *priv) { - videobuf_queue_init(q, ops, dev, irqlock, type, field, msize, priv); - q->int_ops=&pci_ops; + videobuf_queue_core_init(q, ops, dev, irqlock, type, field, msize, + priv, &pci_ops); } /* --------------------------------------------------------------------- */ |
