summaryrefslogtreecommitdiffstats
path: root/drivers/media/video/soc_camera.c
diff options
context:
space:
mode:
authorGuennadi Liakhovetski <g.liakhovetski@pengutronix.de>2008-04-22 14:42:13 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-04-24 14:07:44 -0300
commit0705135e59f8503e4dade4b3580fed77b1743b7c (patch)
tree9ab28abeff6cb8ffa50e565204ed4394524d28d7 /drivers/media/video/soc_camera.c
parentf13613acfb1a71895ac886dc831d6ae4e20e241a (diff)
downloadblackbird-op-linux-0705135e59f8503e4dade4b3580fed77b1743b7c.tar.gz
blackbird-op-linux-0705135e59f8503e4dade4b3580fed77b1743b7c.zip
V4L/DVB (7237): Convert videobuf-dma-sg to generic DMA API
videobuf-dma-sg does not need to depend on PCI. Switch it to using generic DMA API, convert all affected drivers, relax Kconfig restriction, improve compile-time type checking, fix some Coding Style violations while at it. Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@pengutronix.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/soc_camera.c')
-rw-r--r--drivers/media/video/soc_camera.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/soc_camera.c b/drivers/media/video/soc_camera.c
index 904e9dfc1a89..c947525c3f2f 100644
--- a/drivers/media/video/soc_camera.c
+++ b/drivers/media/video/soc_camera.c
@@ -210,7 +210,7 @@ static int soc_camera_open(struct inode *inode, struct file *file)
/* We must pass NULL as dev pointer, then all pci_* dma operations
* transform to normal dma_* ones. Do we need an irqlock? */
- videobuf_queue_pci_init(&icf->vb_vidq, ici->vbq_ops, NULL, NULL,
+ videobuf_queue_sg_init(&icf->vb_vidq, ici->vbq_ops, NULL, NULL,
V4L2_BUF_TYPE_VIDEO_CAPTURE, V4L2_FIELD_NONE,
ici->msize, icd);
OpenPOWER on IntegriCloud