diff options
author | Hans Verkuil <hverkuil@xs4all.nl> | 2008-07-18 10:07:10 -0300 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-20 07:29:27 -0300 |
commit | fac3639d886ae577d74e2da16e6a448620d432c9 (patch) | |
tree | 2771f7bd1e2f7225b451dc5a272f30b5515e90e4 /drivers/media/video/cx18/cx18-streams.c | |
parent | f19ad390146e7745cbc529f3bef8469cf21f3a6b (diff) | |
download | linux-fac3639d886ae577d74e2da16e6a448620d432c9.tar.gz linux-fac3639d886ae577d74e2da16e6a448620d432c9.tar.bz2 linux-fac3639d886ae577d74e2da16e6a448620d432c9.zip |
V4L/DVB (8414): videodev/cx18: fix get_index bug and error-handling lock-ups
Fix a bug in get_index that was introduced earlier.
Also fix two error handling lock-ups in videodev and cx18 that
where found thanks to that bug.
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-streams.c')
-rw-r--r-- | drivers/media/video/cx18/cx18-streams.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/media/video/cx18/cx18-streams.c b/drivers/media/video/cx18/cx18-streams.c index f3d20509a8bd..1728b1d832a9 100644 --- a/drivers/media/video/cx18/cx18-streams.c +++ b/drivers/media/video/cx18/cx18-streams.c @@ -311,8 +311,10 @@ void cx18_streams_cleanup(struct cx18 *cx, int unregister) /* Teardown all streams */ for (type = 0; type < CX18_MAX_STREAMS; type++) { - if (cx->streams[type].dvb.enabled) + if (cx->streams[type].dvb.enabled) { cx18_dvb_unregister(&cx->streams[type]); + cx->streams[type].dvb.enabled = false; + } vdev = cx->streams[type].v4l2dev; |