Commit 9fb82aaa authored by Dafna Hirschfeld's avatar Dafna Hirschfeld Committed by Mauro Carvalho Chehab
Browse files

media: vimc: move media_entity_cleanup to release callbacks 



according to the docs, this function must be called during
the cleanup phase after unregistering the entity.

Signed-off-by: default avatarDafna Hirschfeld <dafna.hirschfeld@collabora.com>
Acked-by: default avatarHelen Koike <helen.koike@collabora.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent 291aca4e

drivers/media/platform/vimc/vimc-capture.c

+1 −1
Original line number Diff line number Diff line
@@ -330,6 +330,7 @@ static void vimc_cap_release(struct video_device *vdev) 
	struct vimc_cap_device *vcap =

		container_of(vdev, struct vimc_cap_device, vdev);



	media_entity_cleanup(vcap->ved.ent);

	vimc_pads_cleanup(vcap->ved.pads);

	kfree(vcap);

}
@@ -340,7 +341,6 @@ void vimc_cap_rm(struct vimc_device *vimc, struct vimc_ent_device *ved) 


	vcap = container_of(ved, struct vimc_cap_device, ved);

	vb2_queue_release(&vcap->queue);

	media_entity_cleanup(ved->ent);

	video_unregister_device(&vcap->vdev);

}

drivers/media/platform/vimc/vimc-common.c

+0 −1
Original line number Diff line number Diff line
@@ -423,7 +423,6 @@ EXPORT_SYMBOL_GPL(vimc_ent_sd_register); 


void vimc_ent_sd_unregister(struct vimc_ent_device *ved, struct v4l2_subdev *sd)

{

	media_entity_cleanup(ved->ent);

	v4l2_device_unregister_subdev(sd);

}

EXPORT_SYMBOL_GPL(vimc_ent_sd_unregister);

drivers/media/platform/vimc/vimc-debayer.c

+1 −0
Original line number Diff line number Diff line
@@ -477,6 +477,7 @@ static void vimc_deb_release(struct v4l2_subdev *sd) 
	struct vimc_deb_device *vdeb =

				container_of(sd, struct vimc_deb_device, sd);



	media_entity_cleanup(vdeb->ved.ent);

	vimc_pads_cleanup(vdeb->ved.pads);

	kfree(vdeb);

}

drivers/media/platform/vimc/vimc-scaler.c

+1 −0
Original line number Diff line number Diff line
@@ -336,6 +336,7 @@ static void vimc_sca_release(struct v4l2_subdev *sd) 
	struct vimc_sca_device *vsca =

				container_of(sd, struct vimc_sca_device, sd);



	media_entity_cleanup(vsca->ved.ent);

	vimc_pads_cleanup(vsca->ved.pads);

	kfree(vsca);

}

drivers/media/platform/vimc/vimc-sensor.c

+1 −0
Original line number Diff line number Diff line
@@ -291,6 +291,7 @@ static void vimc_sen_release(struct v4l2_subdev *sd) 


	v4l2_ctrl_handler_free(&vsen->hdl);

	tpg_free(&vsen->tpg);

	media_entity_cleanup(vsen->ved.ent);

	vimc_pads_cleanup(vsen->ved.pads);

	kfree(vsen);

}