| Message ID | 20200505125042.v1.2.Ie596e59e0a18935f0b7321ff45e5c5f2ce8082b1@changeid (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | MTK MDP driver cleanups to prep for futher work | expand |
Hi Eizan, Thank you for your patch. Missatge de Eizan Miyamoto <eizan@chromium.org> del dia dt., 5 de maig 2020 a les 6:01: > > This is a cleanup to better handle errors during MDP probe. > > Signed-off-by: eizan@chromium.org > Signed-off-by: Eizan Miyamoto <eizan@google.com> Same comment as the first patch. You should probably fix your configuration. > --- > > drivers/media/platform/mtk-mdp/mtk_mdp_core.c | 8 +++++++- > 1 file changed, 7 insertions(+), 1 deletion(-) > > diff --git a/drivers/media/platform/mtk-mdp/mtk_mdp_core.c b/drivers/media/platform/mtk-mdp/mtk_mdp_core.c > index aeaed2cf4458..c20ac7681c6f 100644 > --- a/drivers/media/platform/mtk-mdp/mtk_mdp_core.c > +++ b/drivers/media/platform/mtk-mdp/mtk_mdp_core.c > @@ -193,13 +193,19 @@ static int mtk_mdp_probe(struct platform_device *pdev) > > platform_set_drvdata(pdev, mdp); > > - vb2_dma_contig_set_max_seg_size(&pdev->dev, DMA_BIT_MASK(32)); > + ret = vb2_dma_contig_set_max_seg_size(&pdev->dev, DMA_BIT_MASK(32)); > + if (ret) { > + dev_err(&pdev->dev, "Failed to set vb2 dma mag seg size\n"); > + goto err_set_max_seg_size; You don't need to introduce a new label, just goto err_m2m_register > + } > > pm_runtime_enable(dev); > dev_dbg(dev, "mdp-%d registered successfully\n", mdp->id); > > return 0; > > +err_set_max_seg_size: > + > err_m2m_register: > v4l2_device_unregister(&mdp->v4l2_dev); > > -- > 2.26.2.526.g744177e7f7-goog > > > _______________________________________________ > Linux-mediatek mailing list > Linux-mediatek@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-mediatek
diff --git a/drivers/media/platform/mtk-mdp/mtk_mdp_core.c b/drivers/media/platform/mtk-mdp/mtk_mdp_core.c index aeaed2cf4458..c20ac7681c6f 100644 --- a/drivers/media/platform/mtk-mdp/mtk_mdp_core.c +++ b/drivers/media/platform/mtk-mdp/mtk_mdp_core.c @@ -193,13 +193,19 @@ static int mtk_mdp_probe(struct platform_device *pdev) platform_set_drvdata(pdev, mdp); - vb2_dma_contig_set_max_seg_size(&pdev->dev, DMA_BIT_MASK(32)); + ret = vb2_dma_contig_set_max_seg_size(&pdev->dev, DMA_BIT_MASK(32)); + if (ret) { + dev_err(&pdev->dev, "Failed to set vb2 dma mag seg size\n"); + goto err_set_max_seg_size; + } pm_runtime_enable(dev); dev_dbg(dev, "mdp-%d registered successfully\n", mdp->id); return 0; +err_set_max_seg_size: + err_m2m_register: v4l2_device_unregister(&mdp->v4l2_dev);