Message ID | 20191207224740.24536-6-matthias.bgg@kernel.org (mailing list archive) |
---|---|
State | Not Applicable, archived |
Headers | show |
Series | arm/arm64: mediatek: Fix mmsys device probing | expand |
Hi Matthias, On 7/12/19 23:47, matthias.bgg@kernel.org wrote: > From: Matthias Brugger <mbrugger@suse.com> > > Check the return value of of_clk_get and print an error > message if not EPROBE_DEFER. > > Signed-off-by: Matthias Brugger <mbrugger@suse.com> > --- > drivers/media/platform/mtk-mdp/mtk_mdp_comp.c | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/drivers/media/platform/mtk-mdp/mtk_mdp_comp.c b/drivers/media/platform/mtk-mdp/mtk_mdp_comp.c > index 9afe8161a8c0..4e2fc1337b80 100644 > --- a/drivers/media/platform/mtk-mdp/mtk_mdp_comp.c > +++ b/drivers/media/platform/mtk-mdp/mtk_mdp_comp.c > @@ -110,6 +110,12 @@ int mtk_mdp_comp_init(struct device *dev, struct device_node *node, > > for (i = 0; i < ARRAY_SIZE(comp->clk); i++) { > comp->clk[i] = of_clk_get(node, i); > + if (IS_ERR(comp->clk[i])i) { Oops ^ > + if (PTR_ERR(comp->clk[i] != -EPROBE_DEFER) and missing closing ) > + dev_err(dev, "Failed to get clock\n"); Like the previous patch I think that the clk core will print a message if the clock is not found and you can just this redundand dev_err. > + > + return PTR_ERR(comp->clk[i]); > + } > > /* Only RDMA needs two clocks */ > if (comp->type != MTK_MDP_RDMA) >
diff --git a/drivers/media/platform/mtk-mdp/mtk_mdp_comp.c b/drivers/media/platform/mtk-mdp/mtk_mdp_comp.c index 9afe8161a8c0..4e2fc1337b80 100644 --- a/drivers/media/platform/mtk-mdp/mtk_mdp_comp.c +++ b/drivers/media/platform/mtk-mdp/mtk_mdp_comp.c @@ -110,6 +110,12 @@ int mtk_mdp_comp_init(struct device *dev, struct device_node *node, for (i = 0; i < ARRAY_SIZE(comp->clk); i++) { comp->clk[i] = of_clk_get(node, i); + if (IS_ERR(comp->clk[i])i) { + if (PTR_ERR(comp->clk[i] != -EPROBE_DEFER) + dev_err(dev, "Failed to get clock\n"); + + return PTR_ERR(comp->clk[i]); + } /* Only RDMA needs two clocks */ if (comp->type != MTK_MDP_RDMA)