---

yaml --- r: 295111 b: refs/heads/master c: 0770d07 h: refs/heads/master i: 295109: 75e2cf5 295107: 49e9b49 295103: 2372812 v: v3
git-mirror · Mar 20, 2012 · 3921389 · 3921389
1 parent 7cc6a04
commit 3921389
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 49df19ebcc60fd46f2587774cd6e224007af1116
+refs/heads/master: 0770d07f7b33081f68f8d7a291395005d7044c6b
diff --git a/trunk/drivers/media/video/marvell-ccic/mcam-core.c b/trunk/drivers/media/video/marvell-ccic/mcam-core.c
@@ -1564,11 +1564,8 @@ static int mcam_v4l_release(struct file *filp)
 			singles, delivered);
 	mutex_lock(&cam->s_mutex);
 	(cam->users)--;
-	if (filp == cam->owner) {
-		mcam_ctlr_stop_dma(cam);
-		cam->owner = NULL;
-	}
 	if (cam->users == 0) {
+		mcam_ctlr_stop_dma(cam);
 		mcam_cleanup_vb2(cam);
 		mcam_ctlr_power_down(cam);
 		if (cam->buffer_mode == B_vmalloc && alloc_bufs_at_read)

diff --git a/trunk/drivers/media/video/marvell-ccic/mcam-core.h b/trunk/drivers/media/video/marvell-ccic/mcam-core.h
@@ -107,7 +107,6 @@ struct mcam_camera {
 	enum mcam_state state;
 	unsigned long flags;		/* Buffer status, mainly (dev_lock) */
 	int users;			/* How many open FDs */
-	struct file *owner;		/* Who has data access (v4l2) */
 
 	/*
 	 * Subsystem structures.