diff options
author | Hans Verkuil <hverkuil@xs4all.nl> | 2008-05-25 10:21:27 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-06-05 05:35:45 -0400 |
commit | 31554ae599a8ff6854bf8ecbedc1946c64854388 (patch) | |
tree | 33169d397f17069e72d72695f6adb59a4a25b210 /drivers/media/video/cx18/cx18-driver.c | |
parent | be303e16dbd210077c697aaf2f0960413166b53d (diff) |
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.c | 2 |
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) | |||
889 | 889 | ||
890 | /* Stop all captures */ | 890 | /* Stop all captures */ |
891 | CX18_DEBUG_INFO("Stopping all streams\n"); | 891 | CX18_DEBUG_INFO("Stopping all streams\n"); |
892 | if (atomic_read(&cx->capturing) > 0) | 892 | if (atomic_read(&cx->tot_capturing) > 0) |
893 | cx18_stop_all_captures(cx); | 893 | cx18_stop_all_captures(cx); |
894 | 894 | ||
895 | /* Interrupts */ | 895 | /* Interrupts */ |