From 3921389cc2a07cfd17b194e4b87bf7eb56c7f71b Mon Sep 17 00:00:00 2001
From: Jonathan Corbet <corbet@lwn.net>
Date: Fri, 16 Mar 2012 19:14:51 -0300
Subject: [PATCH] --- yaml --- r: 295111 b: refs/heads/master c:
 0770d07f7b33081f68f8d7a291395005d7044c6b h: refs/heads/master i:   295109:
 75e2cf5b0615aa5cd81f69f3f1b47dfd42cc83e2   295107:
 49e9b4962fe053d2ed6e544cc0e06ea22823177a   295103:
 2372812e79d54a0975e7a0eab3e87c511e70a0a8 v: v3

---
 [refs]                                             | 2 +-
 trunk/drivers/media/video/marvell-ccic/mcam-core.c | 5 +----
 trunk/drivers/media/video/marvell-ccic/mcam-core.h | 1 -
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index baa2ee54d016..3504d08ef2fe 100644
--- 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
index 35cd89d3e676..b26118246763 100644
--- 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
index 917200e63255..bd6acba9fb37 100644
--- 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.