drm/tegra: sor: Disable runtime PM on probe failure (ad2139cb) · Commits · 戴 / test

drivers/gpu/drm/tegra/sor.c

+8 −6

Original line number	Diff line number	Diff line
		@@ -3925,13 +3925,13 @@ static int tegra_sor_probe(struct platform_device *pdev)
		sor->index);
		if (!name) {
		err = -ENOMEM;
		goto remove;
		goto rpm_disable;
		}

		err = host1x_client_resume(&sor->client);
		if (err < 0) {
		dev_err(sor->dev, "failed to resume: %d\n", err);
		goto remove;
		goto rpm_disable;
		}

		sor->clk_pad = tegra_clk_sor_pad_register(sor, name);
		@@ -3942,7 +3942,7 @@ static int tegra_sor_probe(struct platform_device *pdev)
		err = PTR_ERR(sor->clk_pad);
		dev_err(&pdev->dev, "failed to register SOR pad clock: %d\n",
		err);
		goto remove;
		goto rpm_disable;
		}

		INIT_LIST_HEAD(&sor->client.list);
		@@ -3953,11 +3953,13 @@ static int tegra_sor_probe(struct platform_device *pdev)
		if (err < 0) {
		dev_err(&pdev->dev, "failed to register host1x client: %d\n",
		err);
		goto remove;
		goto rpm_disable;
		}

		return 0;

		rpm_disable:
		pm_runtime_disable(&pdev->dev);
		remove:
		if (sor->ops && sor->ops->remove)
		sor->ops->remove(sor);
		@@ -3971,8 +3973,6 @@ static int tegra_sor_remove(struct platform_device *pdev)
		struct tegra_sor *sor = platform_get_drvdata(pdev);
		int err;

		pm_runtime_disable(&pdev->dev);

		err = host1x_client_unregister(&sor->client);
		if (err < 0) {
		dev_err(&pdev->dev, "failed to unregister host1x client: %d\n",
		@@ -3980,6 +3980,8 @@ static int tegra_sor_remove(struct platform_device *pdev)
		return err;
		}

		pm_runtime_disable(&pdev->dev);

		if (sor->ops && sor->ops->remove) {
		err = sor->ops->remove(sor);
		if (err < 0)