[media] marvell-cam: Remove broken "owner" logic

The marvell cam driver retained just enough of the owner-tracking logic
from cafe_ccic to be broken; it could, conceivably, cause the driver to
release DMA memory while the controller is still active.  Simply remove the
remaining pieces and ensure that the controller is stopped before we free
things.

Signed-off-by: Jonathan Corbet <corbet@lwn.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/video/marvell-ccic/mcam-core.c b/drivers/media/video/marvell-ccic/mcam-core.c
index 35cd89d3e6768503d9ef3043b51468dc4d621fd9..b261182467636e85baab6b5ce88bce595d4a227b 100644 (file)
--- a/drivers/media/video/marvell-ccic/mcam-core.c
+++ b/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/drivers/media/video/marvell-ccic/mcam-core.h b/drivers/media/video/marvell-ccic/mcam-core.h
index 917200e63255d2ee5b778edb71da245076910619..bd6acba9fb37c2f437060889d172c8b44bd3229b 100644 (file)
--- a/drivers/media/video/marvell-ccic/mcam-core.h
+++ b/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.