Merge "spmi: pmic-arb: Always allocate ppid_to_apid table" (6b5ff575) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/spmi/spmi-pmic-arb.c

+7 −9

Original line number	Diff line number	Diff line
		@@ -1264,6 +1264,13 @@ static int spmi_pmic_arb_probe(struct platform_device *pdev)
		goto err_put_ctrl;
		}

		pa->ppid_to_apid = devm_kcalloc(&ctrl->dev, PMIC_ARB_MAX_PPID,
		sizeof(*pa->ppid_to_apid), GFP_KERNEL);
		if (!pa->ppid_to_apid) {
		err = -ENOMEM;
		goto err_put_ctrl;
		}

		hw_ver = readl_relaxed(core + PMIC_ARB_VERSION);

		if (hw_ver < PMIC_ARB_VERSION_V2_MIN) {
		@@ -1299,15 +1306,6 @@ static int spmi_pmic_arb_probe(struct platform_device *pdev)
		err = PTR_ERR(pa->wr_base);
		goto err_put_ctrl;
		}

		pa->ppid_to_apid = devm_kcalloc(&ctrl->dev,
		PMIC_ARB_MAX_PPID,
		sizeof(*pa->ppid_to_apid),
		GFP_KERNEL);
		if (!pa->ppid_to_apid) {
		err = -ENOMEM;
		goto err_put_ctrl;
		}
		}

		dev_info(&ctrl->dev, "PMIC arbiter version %s (0x%x)\n",