[media] gspca: Don't set gspca_dev->dev to NULL before stop0
In commita3d6e8cc0e
gspca_dev->dev is set to NULL on disconnect, before calling stop0. The plan was to get rid of gspca_dev->present and instead simply check for gspca_dev->dev everywhere where we were checking for present. This should be race free since all users of gspca_dev->dev hold the usb_lock, or so I thought. But I was wrong, drivers which use a work-queue + synchronous bulk transfers to get the video data don't hold the usb_lock while doing so, their stop0 callbacks stop the workqueue, so they won't be using gspca_dev->dev anymore after the stop0 call, but they might be dereferincing it before, so we should not set gspca_dev->dev to NULL on disconnect before calling stop0. This also means that the workqueue functions in these drivers cannot use gspca_dev->dev to check if they need to stop because of disconnection, so we will need to keep gspca_dev->present around, and set that to 0 on disconnect, before calling stop0. Unfortunately as part of the plan to remove gspca_dev->present, these workqueues where already moved over to checking for gspca_dev->dev instead of gspca_dev->present as part of commit254902b01d
, so this patch also reverts those parts of that commit. Signed-off-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
此提交包含在:
@@ -232,7 +232,7 @@ static void sq905_dostream(struct work_struct *work)
|
||||
frame_sz = gspca_dev->cam.cam_mode[gspca_dev->curr_mode].sizeimage
|
||||
+ FRAME_HEADER_LEN;
|
||||
|
||||
while (gspca_dev->dev && gspca_dev->streaming) {
|
||||
while (gspca_dev->present && gspca_dev->streaming) {
|
||||
#ifdef CONFIG_PM
|
||||
if (gspca_dev->frozen)
|
||||
break;
|
||||
@@ -246,7 +246,7 @@ static void sq905_dostream(struct work_struct *work)
|
||||
we must finish reading an entire frame, otherwise the
|
||||
next time we stream we start reading in the middle of a
|
||||
frame. */
|
||||
while (bytes_left > 0 && gspca_dev->dev) {
|
||||
while (bytes_left > 0 && gspca_dev->present) {
|
||||
data_len = bytes_left > SQ905_MAX_TRANSFER ?
|
||||
SQ905_MAX_TRANSFER : bytes_left;
|
||||
ret = sq905_read_data(gspca_dev, buffer, data_len, 1);
|
||||
@@ -278,7 +278,7 @@ static void sq905_dostream(struct work_struct *work)
|
||||
gspca_frame_add(gspca_dev, LAST_PACKET,
|
||||
NULL, 0);
|
||||
}
|
||||
if (gspca_dev->dev) {
|
||||
if (gspca_dev->present) {
|
||||
/* acknowledge the frame */
|
||||
mutex_lock(&gspca_dev->usb_lock);
|
||||
ret = sq905_ack_frame(gspca_dev);
|
||||
@@ -288,7 +288,7 @@ static void sq905_dostream(struct work_struct *work)
|
||||
}
|
||||
}
|
||||
quit_stream:
|
||||
if (gspca_dev->dev) {
|
||||
if (gspca_dev->present) {
|
||||
mutex_lock(&gspca_dev->usb_lock);
|
||||
sq905_command(gspca_dev, SQ905_CLEAR);
|
||||
mutex_unlock(&gspca_dev->usb_lock);
|
||||
|
新增問題並參考
封鎖使用者