diff options
| author | Hans Verkuil <hans.verkuil@cisco.com> | 2014-12-12 13:28:00 (GMT) |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2014-12-23 12:22:00 (GMT) |
| commit | b6f21dc3541a3660acfec1e789a011e6d4154173 (patch) | |
| tree | 9c2c1721d8dcd8e2efac78536d4fdf284e1e159c /drivers/media/pci/cx25821/cx25821-core.c | |
| parent | 11c8a2df2cf8c213e1970d548aee067887971ef8 (diff) | |
| download | linux-b6f21dc3541a3660acfec1e789a011e6d4154173.tar.xz | |
[media] cx25821: remove video output support
The video output functionality never worked for this driver. Now remove the
creation of the output video nodes as well to prevent users from thinking
that video output is available, when it isn't.
To correctly implement this the video output should use vb2 as well, and
that requires rewriting the output DMA setup. But without hardware to test
I am not able to do that.
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/media/pci/cx25821/cx25821-core.c')
| -rw-r--r-- | drivers/media/pci/cx25821/cx25821-core.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/media/pci/cx25821/cx25821-core.c b/drivers/media/pci/cx25821/cx25821-core.c index c1ea24e..559f829 100644 --- a/drivers/media/pci/cx25821/cx25821-core.c +++ b/drivers/media/pci/cx25821/cx25821-core.c @@ -965,11 +965,15 @@ void cx25821_dev_unregister(struct cx25821_dev *dev) release_mem_region(dev->base_io_addr, pci_resource_len(dev->pci, 0)); - for (i = 0; i < MAX_VID_CHANNEL_NUM - 1; i++) { + for (i = 0; i < MAX_VID_CAP_CHANNEL_NUM - 1; i++) { if (i == SRAM_CH08) /* audio channel */ continue; + /* + * TODO: enable when video output is properly + * supported. if (i == SRAM_CH09 || i == SRAM_CH10) cx25821_free_mem_upstream(&dev->channels[i]); + */ cx25821_video_unregister(dev, i); } |