Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1533801 > unrolled thread

[PATCH] V4l: omap4iss: Clean up file handle in open() and release().

Back to article view | Back to linux.kernel

Contents

  [PATCH] V4l: omap4iss: Clean up file handle in open() and release(). Shailendra Verma <shailendra.v@samsung.com> - 2016-12-01 06:00 +0100
    Re: [PATCH] V4l: omap4iss: Clean up file handle in open() and release(). Laurent Pinchart <laurent.pinchart@ideasonboard.com> - 2016-12-01 11:30 +0100

#1533801 — [PATCH] V4l: omap4iss: Clean up file handle in open() and release().

Both functions initialize the file handle with v4l2_fh_init()
and thus need to call clean up with v4l2_fh_exit() as appropriate.

Signed-off-by: Shailendra Verma <shailendra.v@samsung.com>
---
 drivers/staging/media/omap4iss/iss_video.c |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/staging/media/omap4iss/iss_video.c b/drivers/staging/media/omap4iss/iss_video.c
index c16927a..077c9f8 100644
--- a/drivers/staging/media/omap4iss/iss_video.c
+++ b/drivers/staging/media/omap4iss/iss_video.c
@@ -1141,6 +1141,7 @@ static int iss_video_open(struct file *file)
 done:
 	if (ret < 0) {
 		v4l2_fh_del(&handle->vfh);
+		v4l2_fh_exit(&handle->vfh);
 		kfree(handle);
 	}
 
@@ -1162,6 +1163,7 @@ static int iss_video_release(struct file *file)
 	vb2_queue_release(&handle->queue);
 
 	v4l2_fh_del(vfh);
+	v4l2_fh_exit(vfh);
 	kfree(handle);
 	file->private_data = NULL;
 
-- 
1.7.9.5

[toc] | [next] | [standalone]

#1533954

Hi Shailendra,

Thank you for the patch.

On Thursday 01 Dec 2016 10:22:52 Shailendra Verma wrote:
> Both functions initialize the file handle with v4l2_fh_init()
> and thus need to call clean up with v4l2_fh_exit() as appropriate.
> 
> Signed-off-by: Shailendra Verma <shailendra.v@samsung.com>

Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

and applied to my tree for v4.11.

> ---
>  drivers/staging/media/omap4iss/iss_video.c |    2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/drivers/staging/media/omap4iss/iss_video.c
> b/drivers/staging/media/omap4iss/iss_video.c index c16927a..077c9f8 100644
> --- a/drivers/staging/media/omap4iss/iss_video.c
> +++ b/drivers/staging/media/omap4iss/iss_video.c
> @@ -1141,6 +1141,7 @@ static int iss_video_open(struct file *file)
>  done:
>  	if (ret < 0) {
>  		v4l2_fh_del(&handle->vfh);
> +		v4l2_fh_exit(&handle->vfh);
>  		kfree(handle);
>  	}
> 
> @@ -1162,6 +1163,7 @@ static int iss_video_release(struct file *file)
>  	vb2_queue_release(&handle->queue);
> 
>  	v4l2_fh_del(vfh);
> +	v4l2_fh_exit(vfh);
>  	kfree(handle);
>  	file->private_data = NULL;

-- 
Regards,

Laurent Pinchart

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web