Commit 74ff2640 authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Mauro Carvalho Chehab
Browse files

media: vsp1: Don't open-code vb2_fop_release() 



Use the vb2_fop_release() helper to replace the open-coded version. The
video->lock is assigned to the queue lock, used by vb2_fop_release(), so
the only functional difference is that v4l2_fh_release() is now called
before vsp1_device_put(). This should be harmless.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Reviewed-by: default avatarKieran Bingham <kieran.bingham+renesas@ideasonboard.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent 7101d127

drivers/media/platform/renesas/vsp1/vsp1_video.c

+1 −11
Original line number Diff line number Diff line
@@ -1127,21 +1127,11 @@ static int vsp1_video_open(struct file *file) 
static int vsp1_video_release(struct file *file)

{

	struct vsp1_video *video = video_drvdata(file);

	struct v4l2_fh *vfh = file->private_data;



	mutex_lock(&video->lock);

	if (video->queue.owner == vfh) {

		vb2_queue_release(&video->queue);

		video->queue.owner = NULL;

	}

	mutex_unlock(&video->lock);

	vb2_fop_release(file);



	vsp1_device_put(video->vsp1);



	v4l2_fh_release(file);



	file->private_data = NULL;



	return 0;

}