Merge "Coresight: add the fuse check logic for CoreSight cti" (e71a3a13) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/coresight/coresight-cti.c

+3 −12

Original line number	Diff line number	Diff line
		@@ -1401,6 +1401,9 @@ static int cti_probe(struct platform_device *pdev)
		struct device_node *cpu_node;
		const __be32 *cpu_phandle;

		if (coresight_fuse_access_disabled())
		return -EPERM;

		pdata = of_get_coresight_platform_data(dev, pdev->dev.of_node);
		if (IS_ERR(pdata))
		return PTR_ERR(pdata);
		@@ -1433,15 +1436,6 @@ static int cti_probe(struct platform_device *pdev)
		if (ret)
		return ret;

		ret = clk_prepare_enable(drvdata->clk);
		if (ret)
		return ret;

		if (!coresight_authstatus_enabled(drvdata->base))
		goto err0;

		clk_disable_unprepare(drvdata->clk);

		drvdata->gpio_trigin = devm_kzalloc(dev, sizeof(struct cti_pctrl),
		GFP_KERNEL);
		if (!drvdata->gpio_trigin)
		@@ -1542,9 +1536,6 @@ err:
		if (drvdata->cti_save && !drvdata->cti_hwclk)
		clk_disable_unprepare(drvdata->clk);
		return ret;
		err0:
		clk_disable_unprepare(drvdata->clk);
		return -EPERM;
		}

		static int cti_remove(struct platform_device *pdev)