diff options
author | Jean-Francois Moine <moinejf@free.fr> | 2008-09-03 16:12:17 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-09-03 17:37:37 -0400 |
commit | a1e8288b1d80130119692818b46694660f28e03a (patch) | |
tree | 188130051e7c5205d45fce5c87f22f3bc9a8f913 | |
parent | de00448f708a2fd705f9c5ccdfa383dbf3dcef92 (diff) |
V4L/DVB (8824): gspca: Too much code removed in the suspend/resume changeset.
- the stream must stop when the main application closes the device.
Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r-- | drivers/media/video/gspca/gspca.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/media/video/gspca/gspca.c b/drivers/media/video/gspca/gspca.c index fe096e76e5c3..42b0b83d0953 100644 --- a/drivers/media/video/gspca/gspca.c +++ b/drivers/media/video/gspca/gspca.c | |||
@@ -806,6 +806,11 @@ static int dev_close(struct inode *inode, struct file *file) | |||
806 | 806 | ||
807 | /* if the file did the capture, free the streaming resources */ | 807 | /* if the file did the capture, free the streaming resources */ |
808 | if (gspca_dev->capt_file == file) { | 808 | if (gspca_dev->capt_file == file) { |
809 | if (gspca_dev->streaming) { | ||
810 | mutex_lock(&gspca_dev->usb_lock); | ||
811 | gspca_stream_off(gspca_dev); | ||
812 | mutex_unlock(&gspca_dev->usb_lock); | ||
813 | } | ||
809 | frame_free(gspca_dev); | 814 | frame_free(gspca_dev); |
810 | gspca_dev->capt_file = NULL; | 815 | gspca_dev->capt_file = NULL; |
811 | gspca_dev->memory = GSPCA_MEMORY_NO; | 816 | gspca_dev->memory = GSPCA_MEMORY_NO; |