From: Eizan Miyamoto <eizan@chromium.org>
To: LKML <linux-kernel@vger.kernel.org>
Cc: Eizan Miyamoto <eizan@chromium.org>,
Andrew-CT Chen <andrew-ct.chen@mediatek.com>,
Houlong Wei <houlong.wei@mediatek.com>,
Matthias Brugger <matthias.bgg@gmail.com>,
Mauro Carvalho Chehab <mchehab@kernel.org>,
Minghsiu Tsai <minghsiu.tsai@mediatek.com>,
linux-arm-kernel@lists.infradead.org,
linux-media@vger.kernel.org, linux-mediatek@lists.infradead.org
Subject: [PATCH v2 2/5] [media] mtk-mdp: handle vb2_dma_contig_set_max_seg_size errors during probe
Date: Wed, 6 May 2020 15:49:17 +1000 [thread overview]
Message-ID: <20200506154832.v2.2.If340fa06d86053aaea25841b36741fe69c3126dd@changeid> (raw)
In-Reply-To: <20200506054920.109738-1-eizan@chromium.org>
This is a cleanup to better handle errors during MDP probe.
Signed-off-by: eizan@chromium.org
Signed-off-by: Eizan Miyamoto <eizan@chromium.org>
---
Changes in v1:
- remove unnecessary error handling labels in favor of err_m2m_register
drivers/media/platform/mtk-mdp/mtk_mdp_core.c | 6 +++++-
1 file changed, 5 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..9b24b8d46eb7 100644
--- a/drivers/media/platform/mtk-mdp/mtk_mdp_core.c
+++ b/drivers/media/platform/mtk-mdp/mtk_mdp_core.c
@@ -193,7 +193,11 @@ 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_m2m_register;
+ }
pm_runtime_enable(dev);
dev_dbg(dev, "mdp-%d registered successfully\n", mdp->id);
--
2.26.2.526.g744177e7f7-goog
next prev parent reply other threads:[~2020-05-06 5:50 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-06 5:49 [PATCH v2 0/5] MTK MDP driver cleanups to prep for futher work Eizan Miyamoto
2020-05-06 5:49 ` [PATCH v2 1/5] [media] mtk-mdp: remove mtk_mdp_comp.regs from mtk_mdp_comp.h Eizan Miyamoto
2020-05-06 15:19 ` Enric Balletbo i Serra
2020-05-06 5:49 ` Eizan Miyamoto [this message]
2020-05-06 15:22 ` [PATCH v2 2/5] [media] mtk-mdp: handle vb2_dma_contig_set_max_seg_size errors during probe Enric Balletbo Serra
2020-05-06 5:49 ` [PATCH v2 3/5] [media] mtk-mdp: handle vpu_wdt_reg_handler() " Eizan Miyamoto
2020-05-06 15:24 ` Enric Balletbo Serra
2020-05-06 5:49 ` [PATCH v2 4/5] [media] mtk-mdp: convert mtk_mdp_dev.comp array to list Eizan Miyamoto
2020-05-06 5:49 ` [PATCH v2 5/5] [media] mtk-mdp: Remove mtk_mdp_comp.id and supporting functionality Eizan Miyamoto
2020-05-06 15:33 ` Enric Balletbo Serra
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200506154832.v2.2.If340fa06d86053aaea25841b36741fe69c3126dd@changeid \
--to=eizan@chromium.org \
--cc=andrew-ct.chen@mediatek.com \
--cc=houlong.wei@mediatek.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=matthias.bgg@gmail.com \
--cc=mchehab@kernel.org \
--cc=minghsiu.tsai@mediatek.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®