summaryrefslogtreecommitdiffstats
path: root/drivers/media/video/cx18/cx18-driver.c
diff options
context:
space:
mode:
authorHans Verkuil2008-05-25 16:21:27 +0200
committerMauro Carvalho Chehab2008-06-05 11:35:45 +0200
commit31554ae599a8ff6854bf8ecbedc1946c64854388 (patch)
tree33169d397f17069e72d72695f6adb59a4a25b210 /drivers/media/video/cx18/cx18-driver.c
parentV4L/DVB (7930): ivtv: bump version to 1.3.0. (diff)
downloadkernel-qcow2-linux-31554ae599a8ff6854bf8ecbedc1946c64854388.tar.gz
kernel-qcow2-linux-31554ae599a8ff6854bf8ecbedc1946c64854388.tar.xz
kernel-qcow2-linux-31554ae599a8ff6854bf8ecbedc1946c64854388.zip
V4L/DVB (7931): cx18: allow for simultaneous digital and analog capture
The HVR-1600 can do both analog and digital capture at the same time. Due to a driver bug -EBUSY would be returned when attempting to setup an analog capture while a digital capture was already in progress. Separate the two internally. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/cx18/cx18-driver.c')
-rw-r--r--drivers/media/video/cx18/cx18-driver.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/cx18/cx18-driver.c b/drivers/media/video/cx18/cx18-driver.c
index 0dd4e0529970..472f88e64199 100644
--- a/drivers/media/video/cx18/cx18-driver.c
+++ b/drivers/media/video/cx18/cx18-driver.c
@@ -889,7 +889,7 @@ static void cx18_remove(struct pci_dev *pci_dev)
/* Stop all captures */
CX18_DEBUG_INFO("Stopping all streams\n");
- if (atomic_read(&cx->capturing) > 0)
+ if (atomic_read(&cx->tot_capturing) > 0)
cx18_stop_all_captures(cx);
/* Interrupts */