---

yaml --- r: 104060 b: refs/heads/master c: fac3639 h: refs/heads/master v: v3
git-mirror · Jul 20, 2008 · fadffc4 · fadffc4
1 parent 7c9a292
commit fadffc4
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f19ad390146e7745cbc529f3bef8469cf21f3a6b
+refs/heads/master: fac3639d886ae577d74e2da16e6a448620d432c9
diff --git a/trunk/drivers/media/video/cx18/cx18-streams.c b/trunk/drivers/media/video/cx18/cx18-streams.c
@@ -311,8 +311,10 @@ void cx18_streams_cleanup(struct cx18 *cx, int unregister)
 
 	/* Teardown all streams */
 	for (type = 0; type < CX18_MAX_STREAMS; type++) {
-		if (cx->streams[type].dvb.enabled)
+		if (cx->streams[type].dvb.enabled) {
 			cx18_dvb_unregister(&cx->streams[type]);
+			cx->streams[type].dvb.enabled = false;
+		}
 
 		vdev = cx->streams[type].v4l2dev;
 

diff --git a/trunk/drivers/media/video/videodev.c b/trunk/drivers/media/video/videodev.c
@@ -2023,7 +2023,7 @@ EXPORT_SYMBOL(video_ioctl2);
 static int get_index(struct video_device *vdev, int num)
 {
 	u32 used = 0;
-	const unsigned max_index = sizeof(used) * 8 - 1;
+	const int max_index = sizeof(used) * 8 - 1;
 	int i;
 
 	/* Currently a single v4l driver instance cannot create more than
@@ -2145,14 +2145,15 @@ int video_register_device_index(struct video_device *vfd, int type, int nr,
 	vfd->minor=i;
 
 	ret = get_index(vfd, index);
+	vfd->index = ret;
+
+	mutex_unlock(&videodev_lock);
+
 	if (ret < 0) {
 		printk(KERN_ERR "%s: get_index failed\n", __func__);
 		goto fail_minor;
 	}
 
-	vfd->index = ret;
-
-	mutex_unlock(&videodev_lock);
 	mutex_init(&vfd->lock);
 
 	/* sysfs class */