On Wed, Dec 22, 2021 at 01:57:15AM +0800, Mark Brown wrote:
>> + for (i = CLK_NONE + 1; i < CLK_MAX; i++) {
>> clk[i] = devm_clk_get(&pdev->dev, clk_names[i]);
>> + if (IS_ERR(clk[i]))
>> + return PTR_ERR(clk[i]);
>
> This now pays attention to the error code here which is good but...
>
>> - init_clks(pdev, clk);
>> + ret = init_clks(pdev, clk);
>> + if (ret)
>> + return ERR_PTR(-ENOMEM);
>
> ...then discards it here with a random most likely inappropriate error
> code.
Yes, you are right and now the return code depending on the
init_clks().
Fixes: 6078c651947a ("soc: mediatek: Refine scpsys to support multiple platform")
Signed-off-by: Jiasheng Jiang <[email protected]>
---
Changelog:
v1 -> v2
*Change 1. Change the return code.
---
drivers/soc/mediatek/mtk-scpsys.c | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/drivers/soc/mediatek/mtk-scpsys.c b/drivers/soc/mediatek/mtk-scpsys.c
index ca75b14931ec..670cc82d17dc 100644
--- a/drivers/soc/mediatek/mtk-scpsys.c
+++ b/drivers/soc/mediatek/mtk-scpsys.c
@@ -411,12 +411,17 @@ static int scpsys_power_off(struct generic_pm_domain *genpd)
return ret;
}
-static void init_clks(struct platform_device *pdev, struct clk **clk)
+static int init_clks(struct platform_device *pdev, struct clk **clk)
{
int i;
- for (i = CLK_NONE + 1; i < CLK_MAX; i++)
+ for (i = CLK_NONE + 1; i < CLK_MAX; i++) {
clk[i] = devm_clk_get(&pdev->dev, clk_names[i]);
+ if (IS_ERR(clk[i]))
+ return PTR_ERR(clk[i]);
+ }
+
+ return 0;
}
static struct scp *init_scp(struct platform_device *pdev,
@@ -426,7 +431,7 @@ static struct scp *init_scp(struct platform_device *pdev,
{
struct genpd_onecell_data *pd_data;
struct resource *res;
- int i, j;
+ int i, j, ret;
struct scp *scp;
struct clk *clk[CLK_MAX];
@@ -481,7 +486,9 @@ static struct scp *init_scp(struct platform_device *pdev,
pd_data->num_domains = num;
- init_clks(pdev, clk);
+ ret = init_clks(pdev, clk);
+ if (ret)
+ return ERR_PTR(ret);
for (i = 0; i < num; i++) {
struct scp_domain *scpd = &scp->domains[i];
--
2.25.1
On Wed, Dec 22, 2021 at 09:51:57AM +0800, Jiasheng Jiang wrote:
> On Wed, Dec 22, 2021 at 01:57:15AM +0800, Mark Brown wrote:
> >> + for (i = CLK_NONE + 1; i < CLK_MAX; i++) {
> >> clk[i] = devm_clk_get(&pdev->dev, clk_names[i]);
> >> + if (IS_ERR(clk[i]))
> >> + return PTR_ERR(clk[i]);
> >
> > This now pays attention to the error code here which is good but...
> >
> >> - init_clks(pdev, clk);
> >> + ret = init_clks(pdev, clk);
> >> + if (ret)
> >> + return ERR_PTR(-ENOMEM);
> >
> > ...then discards it here with a random most likely inappropriate error
> > code.
>
> Yes, you are right and now the return code depending on the
> init_clks().
Please submit patches in the format covered in submitting-patches.rst -
write a proper changelog for your patches.
Please submit patches using subject lines reflecting the style for the
subsystem, this makes it easier for people to identify relevant patches.
Look at what existing commits in the area you're changing are doing and
make sure your subject lines visually resemble what they're doing.
There's no need to resubmit to fix this alone.
On Wed, 22 Dec 2021 09:51:57 +0800, Jiasheng Jiang wrote:
> On Wed, Dec 22, 2021 at 01:57:15AM +0800, Mark Brown wrote:
> >> + for (i = CLK_NONE + 1; i < CLK_MAX; i++) {
> >> clk[i] = devm_clk_get(&pdev->dev, clk_names[i]);
> >> + if (IS_ERR(clk[i]))
> >> + return PTR_ERR(clk[i]);
> >
> > This now pays attention to the error code here which is good but...
> >
> >> - init_clks(pdev, clk);
> >> + ret = init_clks(pdev, clk);
> >> + if (ret)
> >> + return ERR_PTR(-ENOMEM);
> >
> > ...then discards it here with a random most likely inappropriate error
> > code.
>
> [...]
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
Thanks!
[1/1] isoc: mediatek: Check for error clk pointer
commit: 9de2b9286a6dd16966959b3cb34fc2ddfd39213e
All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying
to this mail.
Thanks,
Mark