renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-22 12:14:01 +08:00
Code

media: vimc: move media_entity_cleanup to release callbacks

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

Signed-off-by: Dafna Hirschfeld <dafna.hirschfeld@collabora.com>
Acked-by: Helen Koike <helen.koike@collabora.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
This commit is contained in:
Dafna Hirschfeld 2019-10-07 10:50:02 -03:00 committed by Mauro Carvalho Chehab
parent 291aca4e7b
commit 9fb82aaa85
5 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/media/platform/vimc/vimc-capture.c
View File

@ -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);
}

1
drivers/media/platform/vimc/vimc-common.c
View File

@ -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);

1
drivers/media/platform/vimc/vimc-debayer.c
View File

@ -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);
}

1
drivers/media/platform/vimc/vimc-scaler.c
View File

@ -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);
}

1
drivers/media/platform/vimc/vimc-sensor.c
View File

@ -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);
}