diff options
author | Thierry <thierry.merle@free.fr> | 2006-12-04 06:31:17 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-12-10 06:05:46 -0500 |
commit | 5f7fb877be14da92803f0b5b60955e071ebe2d58 (patch) | |
tree | 31f2201908f778d5d02ffb798bfa37346efaf108 /drivers/media/video/usbvision/usbvision.h | |
parent | f2242ee5474f46d87a45cd4e214b5c3aa02ff293 (diff) |
V4L/DVB (4928): Usbvision_v4l2 robustness on disconnect
This patch corrects 2 bugs (causes kernel oops) that occur when
unplugging the peripheral whereas nobody has opened it yet :
- do not call usbvision_stop_isoc if usbvision_init_isoc has not been called
- do not call wakeup_interruptible on waitqueues that did not have been
initialized with init_waitqueue_head
Signed-off-by: Thierry MERLE <thierry.merle@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/usbvision/usbvision.h')
-rw-r--r-- | drivers/media/video/usbvision/usbvision.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/media/video/usbvision/usbvision.h b/drivers/media/video/usbvision/usbvision.h index 870c0cc81d84..ef83a5c4d2fd 100644 --- a/drivers/media/video/usbvision/usbvision.h +++ b/drivers/media/video/usbvision/usbvision.h | |||
@@ -227,9 +227,10 @@ enum FrameState { | |||
227 | 227 | ||
228 | /* stream states */ | 228 | /* stream states */ |
229 | enum StreamState { | 229 | enum StreamState { |
230 | Stream_Off, | 230 | Stream_Off, /* Driver streaming is completely OFF */ |
231 | Stream_Interrupt, | 231 | Stream_Idle, /* Driver streaming is ready to be put ON by the application */ |
232 | Stream_On, | 232 | Stream_Interrupt, /* Driver streaming must be interrupted */ |
233 | Stream_On, /* Driver streaming is put ON by the application */ | ||
233 | }; | 234 | }; |
234 | 235 | ||
235 | enum IsocState { | 236 | enum IsocState { |