[PATCH v2 4/6] omap3isp: Disable streaming at driver unbind time

[Sakari Ailus]

Once the driver is unbound accessing the hardware is not allowed anymore.
Due to this, disable streaming when the device driver is unbound. The
states of the associated objects related to Media controller and videobuf2
frameworks are updated as well, just like if the application disabled
streaming explicitly.

Signed-off-by: Sakari Ailus <sakari.ai...@linux.intel.com>
Acked-by: Hans Verkuil <hans.verk...@cisco.com>
Reviewed-by: Laurent Pinchart <laurent.pinch...@ideasonboard.com>
---
 drivers/media/platform/omap3isp/ispvideo.c | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/drivers/media/platform/omap3isp/ispvideo.c 
b/drivers/media/platform/omap3isp/ispvideo.c
index a3ca2a480d1a..c04d357cd4d0 100644
--- a/drivers/media/platform/omap3isp/ispvideo.c
+++ b/drivers/media/platform/omap3isp/ispvideo.c
@@ -1191,22 +1191,17 @@ isp_video_streamon(struct file *file, void *fh, enum 
v4l2_buf_type type)
 }
 
 static int
-isp_video_streamoff(struct file *file, void *fh, enum v4l2_buf_type type)
+__isp_video_streamoff(struct isp_video *video)
 {
-       struct isp_video_fh *vfh = to_isp_video_fh(fh);
-       struct isp_video *video = video_drvdata(file);
        struct isp_pipeline *pipe = to_isp_pipeline(&video->video.entity);
        enum isp_pipeline_state state;
        unsigned int streaming;
        unsigned long flags;
 
-       if (type != video->type)
-               return -EINVAL;
-
        mutex_lock(&video->stream_lock);
 
        mutex_lock(&video->queue_lock);
-       streaming = vb2_is_streaming(&vfh->queue);
+       streaming = video->queue && vb2_is_streaming(video->queue);
        mutex_unlock(&video->queue_lock);
 
        if (!streaming)
@@ -1229,7 +1224,7 @@ isp_video_streamoff(struct file *file, void *fh, enum 
v4l2_buf_type type)
        omap3isp_video_cancel_stream(video);
 
        mutex_lock(&video->queue_lock);
-       vb2_streamoff(&vfh->queue, type);
+       vb2_streamoff(video->queue, video->queue->type);
        mutex_unlock(&video->queue_lock);
        video->queue = NULL;
        video->error = false;
@@ -1245,6 +1240,17 @@ isp_video_streamoff(struct file *file, void *fh, enum 
v4l2_buf_type type)
 }
 
 static int
+isp_video_streamoff(struct file *file, void *fh, enum v4l2_buf_type type)
+{
+       struct isp_video *video = video_drvdata(file);
+
+       if (type != video->type)
+               return -EINVAL;
+
+       return __isp_video_streamoff(video);
+}
+
+static int
 isp_video_enum_input(struct file *file, void *fh, struct v4l2_input *input)
 {
        if (input->index > 0)
@@ -1494,5 +1500,6 @@ int omap3isp_video_register(struct isp_video *video, 
struct v4l2_device *vdev)
 
 void omap3isp_video_unregister(struct isp_video *video)
 {
+       __isp_video_streamoff(video);
        video_unregister_device(&video->video);
 }
-- 
2.11.0