diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-02-25 00:48:54 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-02-25 00:48:54 -0300 |
| commit | 23d271bea2b77095cc79f0c7356d7e1131bcaeae (patch) | |
| tree | 9587618e84489f1d0cbe7263bfaa674ea18e30a5 /linux/drivers/media/video/soc_camera.c | |
| parent | 4e45e0172add32a7af042e418add1d2f1e4ae5a4 (diff) | |
| download | mediapointer-dvb-s2-23d271bea2b77095cc79f0c7356d7e1131bcaeae.tar.gz mediapointer-dvb-s2-23d271bea2b77095cc79f0c7356d7e1131bcaeae.tar.bz2 | |
From: Guennadi Liakhovetski <g.liakhovetski@pengutronix.de>
Subject: Convert videobuf-dma-sg to generic DMA API
Date: Tue, 19 Feb 2008 13:40:54 +0100 (CET)
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 'linux/drivers/media/video/soc_camera.c')
| -rw-r--r-- | linux/drivers/media/video/soc_camera.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/drivers/media/video/soc_camera.c b/linux/drivers/media/video/soc_camera.c index 904e9dfc1..c947525c3 100644 --- a/linux/drivers/media/video/soc_camera.c +++ b/linux/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); |