Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c99235fa authored by Benoit Parrot's avatar Benoit Parrot Committed by Mauro Carvalho Chehab
Browse files

[media] media: am437x-vpfe: Fix a race condition during release 



There was a race condition where during cleanup/release operation
on-going streaming would cause a kernel panic because the hardware
module was disabled prematurely with IRQ still pending.

Fixes: 417d2e50 ("[media] media: platform: add VPFE capture driver support for AM437X")

Cc: <stable@vger.kernel.org> # v4.0+
Signed-off-by: default avatarBenoit Parrot <bparrot@ti.com>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent 2091f518

drivers/media/platform/am437x/am437x-vpfe.c

+12 −2
Original line number Diff line number Diff line
@@ -1186,14 +1186,24 @@ static int vpfe_initialize_device(struct vpfe_device *vpfe) 
static int vpfe_release(struct file *file)

{

	struct vpfe_device *vpfe = video_drvdata(file);

	bool fh_singular;

	int ret;



	mutex_lock(&vpfe->lock);



	if (v4l2_fh_is_singular_file(file))

		vpfe_ccdc_close(&vpfe->ccdc, vpfe->pdev);

	/* Save the singular status before we call the clean-up helper */

	fh_singular = v4l2_fh_is_singular_file(file);



	/* the release helper will cleanup any on-going streaming */

	ret = _vb2_fop_release(file, NULL);



	/*

	 * If this was the last open file.

	 * Then de-initialize hw module.

	 */

	if (fh_singular)

		vpfe_ccdc_close(&vpfe->ccdc, vpfe->pdev);



	mutex_unlock(&vpfe->lock);



	return ret;