| Message ID | 1595918278-9724-3-git-send-email-alain.volmat@st.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Error handling fixes in stm32-dcmi driver | expand |
Reviewed-by: Hugues Fruchet <hugues.fruchet@st.com> On 7/28/20 8:37 AM, Alain Volmat wrote: > This commit add missing vb2_queue_release calls with the > probe error path and module remove. > Missing v4l2_async_notifier_unregister is also added within > the probe error path > > Fixes: 37404f91ef8b ("[media] stm32-dcmi: STM32 DCMI camera interface driver") > Signed-off-by: Alain Volmat <alain.volmat@st.com> > --- > drivers/media/platform/stm32/stm32-dcmi.c | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) > > diff --git a/drivers/media/platform/stm32/stm32-dcmi.c b/drivers/media/platform/stm32/stm32-dcmi.c > index 5e60d4c6eeeb..57830ee691be 100644 > --- a/drivers/media/platform/stm32/stm32-dcmi.c > +++ b/drivers/media/platform/stm32/stm32-dcmi.c > @@ -2004,7 +2004,7 @@ static int dcmi_probe(struct platform_device *pdev) > > ret = dcmi_graph_init(dcmi); > if (ret < 0) > - goto err_media_entity_cleanup; > + goto err_vb2_queue_release; > > /* Reset device */ > ret = reset_control_assert(dcmi->rstc); > @@ -2030,7 +2030,10 @@ static int dcmi_probe(struct platform_device *pdev) > return 0; > > err_cleanup: > + v4l2_async_notifier_unregister(&dcmi->notifier); > v4l2_async_notifier_cleanup(&dcmi->notifier); > +err_vb2_queue_release: > + vb2_queue_release(q); > err_media_entity_cleanup: > media_entity_cleanup(&dcmi->vdev->entity); > err_device_release: > @@ -2052,6 +2055,7 @@ static int dcmi_remove(struct platform_device *pdev) > > v4l2_async_notifier_unregister(&dcmi->notifier); > v4l2_async_notifier_cleanup(&dcmi->notifier); > + vb2_queue_release(&dcmi->queue); > media_entity_cleanup(&dcmi->vdev->entity); > v4l2_device_unregister(&dcmi->v4l2_dev); > media_device_cleanup(&dcmi->mdev); >
On 28/07/2020 08:37, Alain Volmat wrote: > This commit add missing vb2_queue_release calls with the > probe error path and module remove. No, vb2_queue_release() should not be called. See this series for more information: https://patchwork.linuxtv.org/project/linux-media/cover/20200713113048.1150542-1-hverkuil-cisco@xs4all.nl/ I'm made a PR for that patch series, so hopefully it will be merged soon. From what I can tell you don't need this patch at all for this driver. Regards, Hans > Missing v4l2_async_notifier_unregister is also added within > the probe error path > > Fixes: 37404f91ef8b ("[media] stm32-dcmi: STM32 DCMI camera interface driver") > Signed-off-by: Alain Volmat <alain.volmat@st.com> > --- > drivers/media/platform/stm32/stm32-dcmi.c | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) > > diff --git a/drivers/media/platform/stm32/stm32-dcmi.c b/drivers/media/platform/stm32/stm32-dcmi.c > index 5e60d4c6eeeb..57830ee691be 100644 > --- a/drivers/media/platform/stm32/stm32-dcmi.c > +++ b/drivers/media/platform/stm32/stm32-dcmi.c > @@ -2004,7 +2004,7 @@ static int dcmi_probe(struct platform_device *pdev) > > ret = dcmi_graph_init(dcmi); > if (ret < 0) > - goto err_media_entity_cleanup; > + goto err_vb2_queue_release; > > /* Reset device */ > ret = reset_control_assert(dcmi->rstc); > @@ -2030,7 +2030,10 @@ static int dcmi_probe(struct platform_device *pdev) > return 0; > > err_cleanup: > + v4l2_async_notifier_unregister(&dcmi->notifier); > v4l2_async_notifier_cleanup(&dcmi->notifier); > +err_vb2_queue_release: > + vb2_queue_release(q); > err_media_entity_cleanup: > media_entity_cleanup(&dcmi->vdev->entity); > err_device_release: > @@ -2052,6 +2055,7 @@ static int dcmi_remove(struct platform_device *pdev) > > v4l2_async_notifier_unregister(&dcmi->notifier); > v4l2_async_notifier_cleanup(&dcmi->notifier); > + vb2_queue_release(&dcmi->queue); > media_entity_cleanup(&dcmi->vdev->entity); > v4l2_device_unregister(&dcmi->v4l2_dev); > media_device_cleanup(&dcmi->mdev); >
diff --git a/drivers/media/platform/stm32/stm32-dcmi.c b/drivers/media/platform/stm32/stm32-dcmi.c index 5e60d4c6eeeb..57830ee691be 100644 --- a/drivers/media/platform/stm32/stm32-dcmi.c +++ b/drivers/media/platform/stm32/stm32-dcmi.c @@ -2004,7 +2004,7 @@ static int dcmi_probe(struct platform_device *pdev) ret = dcmi_graph_init(dcmi); if (ret < 0) - goto err_media_entity_cleanup; + goto err_vb2_queue_release; /* Reset device */ ret = reset_control_assert(dcmi->rstc); @@ -2030,7 +2030,10 @@ static int dcmi_probe(struct platform_device *pdev) return 0; err_cleanup: + v4l2_async_notifier_unregister(&dcmi->notifier); v4l2_async_notifier_cleanup(&dcmi->notifier); +err_vb2_queue_release: + vb2_queue_release(q); err_media_entity_cleanup: media_entity_cleanup(&dcmi->vdev->entity); err_device_release: @@ -2052,6 +2055,7 @@ static int dcmi_remove(struct platform_device *pdev) v4l2_async_notifier_unregister(&dcmi->notifier); v4l2_async_notifier_cleanup(&dcmi->notifier); + vb2_queue_release(&dcmi->queue); media_entity_cleanup(&dcmi->vdev->entity); v4l2_device_unregister(&dcmi->v4l2_dev); media_device_cleanup(&dcmi->mdev);
This commit add missing vb2_queue_release calls with the probe error path and module remove. Missing v4l2_async_notifier_unregister is also added within the probe error path Fixes: 37404f91ef8b ("[media] stm32-dcmi: STM32 DCMI camera interface driver") Signed-off-by: Alain Volmat <alain.volmat@st.com> --- drivers/media/platform/stm32/stm32-dcmi.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)