diff --git a/drivers/media/video/gspca/gspca.c b/drivers/media/video/gspca/gspca.c
index fe096e76e5c34079d2bbd0ab49d12eed9fe41e6f..42b0b83d0953add389c41afd5b2428e031cdc532 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)
 
 	/* if the file did the capture, free the streaming resources */
 	if (gspca_dev->capt_file == file) {
+		if (gspca_dev->streaming) {
+			mutex_lock(&gspca_dev->usb_lock);
+			gspca_stream_off(gspca_dev);
+			mutex_unlock(&gspca_dev->usb_lock);
+		}
 		frame_free(gspca_dev);
 		gspca_dev->capt_file = NULL;
 		gspca_dev->memory = GSPCA_MEMORY_NO;