diff options
| author |   Jonathan Corbet <corbet@lwn.net> | 2012-03-16 19:14:51 -0300 |
|---|---|---|
| committer |   Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-03-19 22:15:29 -0300 |
| commit | 0770d07f7b33081f68f8d7a291395005d7044c6b (patch) | |
| tree | bdecbe964775ba9341ea5dba9bc11347ac09ea18 /drivers/media | |
| parent | [media] marvell-cam: ensure that the camera stops when requested (diff) | |
| download | linux-dev-0770d07f7b33081f68f8d7a291395005d7044c6b.tar.xz linux-dev-0770d07f7b33081f68f8d7a291395005d7044c6b.zip | |
[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>
Diffstat (limited to 'drivers/media')
| -rw-r--r-- | drivers/media/video/marvell-ccic/mcam-core.c | 5 | ||||
| -rw-r--r-- | drivers/media/video/marvell-ccic/mcam-core.h | 1 |
2 files changed, 1 insertions, 5 deletions
diff --git a/drivers/media/video/marvell-ccic/mcam-core.c b/drivers/media/video/marvell-ccic/mcam-core.c index 35cd89d3e676..b26118246763 100644 --- 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 917200e63255..bd6acba9fb37 100644 --- 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. |