diff options
author | Hans Verkuil <hans.verkuil@cisco.com> | 2012-05-06 08:28:22 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-05-14 08:28:39 -0400 |
commit | 254902b01d2acc6aced99ec17caa4c6cd890cdea (patch) | |
tree | 2e33317c4e142f73ddca8e24b6c9968325cbc8bc /drivers/media/video/gspca/vicam.c | |
parent | cc7b6f257d42eb9829b38e3a8807943426a89a87 (diff) |
[media] gspca: Fix locking issues related to suspend/resume
There are two bugs here: first the calls to stop0 (in gspca_suspend) and
gspca_init_transfer (in gspca_resume) need to be called with the usb_lock held.
That's true for the other places they are called and it is what subdrivers
expect. Quite a few will unlock the usb_lock in stop0 while waiting for a
worker thread to finish, and if usb_lock isn't held then that can cause a
kernel oops.
The other problem is that a worker thread needs to detect that it has to
halt due to a suspend. Otherwise it will just go on looping. So add tests
against gspca_dev->frozen in the worker threads that need it.
Hdg, 2 minor changes:
1) The finepix device is ok with stopping reading a frame halfway through,
so add frozen checks in all places where we also check if we're still
streaming
2) Use gspca_dev->dev instead of gspca_dev->present to check for disconnect
in all touched drivers. I plan to do this everywhere in the future, and
most relevant lines in the touched drivers are already modified by this
patch.
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/gspca/vicam.c')
-rw-r--r-- | drivers/media/video/gspca/vicam.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/gspca/vicam.c b/drivers/media/video/gspca/vicam.c index e48ec4db6da4..432d6cd99cd6 100644 --- a/drivers/media/video/gspca/vicam.c +++ b/drivers/media/video/gspca/vicam.c | |||
@@ -225,7 +225,7 @@ static void vicam_dostream(struct work_struct *work) | |||
225 | goto exit; | 225 | goto exit; |
226 | } | 226 | } |
227 | 227 | ||
228 | while (gspca_dev->present && gspca_dev->streaming) { | 228 | while (!gspca_dev->frozen && gspca_dev->dev && gspca_dev->streaming) { |
229 | ret = vicam_read_frame(gspca_dev, buffer, frame_sz); | 229 | ret = vicam_read_frame(gspca_dev, buffer, frame_sz); |
230 | if (ret < 0) | 230 | if (ret < 0) |
231 | break; | 231 | break; |
@@ -327,7 +327,7 @@ static void sd_stop0(struct gspca_dev *gspca_dev) | |||
327 | dev->work_thread = NULL; | 327 | dev->work_thread = NULL; |
328 | mutex_lock(&gspca_dev->usb_lock); | 328 | mutex_lock(&gspca_dev->usb_lock); |
329 | 329 | ||
330 | if (gspca_dev->present) | 330 | if (gspca_dev->dev) |
331 | vicam_set_camera_power(gspca_dev, 0); | 331 | vicam_set_camera_power(gspca_dev, 0); |
332 | } | 332 | } |
333 | 333 | ||