All of lore.kernel.org
 help / color / mirror / Atom feed
From: Brian Norris <briannorris@chromium.org>
To: "Heiko Stübner" <heiko@sntech.de>
Cc: linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org,
	linux-rockchip@lists.infradead.org,
	Sandy Huang <hjc@rock-chips.com>,
	Chen-Yu Tsai <wenst@chromium.org>,
	Thomas Hebb <tommyhebb@gmail.com>,
	Brian Norris <briannorris@chromium.org>
Subject: [PATCH v3 3/4] drm/rockchip: dsi: Fix unbalanced clock on probe error
Date: Tue, 28 Sep 2021 14:35:51 -0700	[thread overview]
Message-ID: <20210928143413.v3.3.Ie8ceefb51ab6065a1151869b6fcda41a467d4d2c@changeid> (raw)
In-Reply-To: <20210928213552.1001939-1-briannorris@chromium.org>

Our probe() function never enabled this clock, so we shouldn't disable
it if we fail to probe the bridge.

Noted by inspection.

Fixes: 2d4f7bdafd70 ("drm/rockchip: dsi: migrate to use dw-mipi-dsi bridge driver")
Signed-off-by: Brian Norris <briannorris@chromium.org>
Reviewed-by: Chen-Yu Tsai <wenst@chromium.org>
---

(no changes since v1)

 drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c b/drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c
index 21c67343cc6c..8ea852880d1c 100644
--- a/drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c
+++ b/drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c
@@ -1434,14 +1434,10 @@ static int dw_mipi_dsi_rockchip_probe(struct platform_device *pdev)
 		if (ret != -EPROBE_DEFER)
 			DRM_DEV_ERROR(dev,
 				      "Failed to probe dw_mipi_dsi: %d\n", ret);
-		goto err_clkdisable;
+		return ret;
 	}
 
 	return 0;
-
-err_clkdisable:
-	clk_disable_unprepare(dsi->pllref_clk);
-	return ret;
 }
 
 static int dw_mipi_dsi_rockchip_remove(struct platform_device *pdev)
-- 
2.33.0.685.g46640cef36-goog


WARNING: multiple messages have this Message-ID (diff)
From: Brian Norris <briannorris@chromium.org>
To: "Heiko Stübner" <heiko@sntech.de>
Cc: linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org,
	linux-rockchip@lists.infradead.org,
	Sandy Huang <hjc@rock-chips.com>,
	Chen-Yu Tsai <wenst@chromium.org>,
	Thomas Hebb <tommyhebb@gmail.com>,
	Brian Norris <briannorris@chromium.org>
Subject: [PATCH v3 3/4] drm/rockchip: dsi: Fix unbalanced clock on probe error
Date: Tue, 28 Sep 2021 14:35:51 -0700	[thread overview]
Message-ID: <20210928143413.v3.3.Ie8ceefb51ab6065a1151869b6fcda41a467d4d2c@changeid> (raw)
In-Reply-To: <20210928213552.1001939-1-briannorris@chromium.org>

Our probe() function never enabled this clock, so we shouldn't disable
it if we fail to probe the bridge.

Noted by inspection.

Fixes: 2d4f7bdafd70 ("drm/rockchip: dsi: migrate to use dw-mipi-dsi bridge driver")
Signed-off-by: Brian Norris <briannorris@chromium.org>
Reviewed-by: Chen-Yu Tsai <wenst@chromium.org>
---

(no changes since v1)

 drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c b/drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c
index 21c67343cc6c..8ea852880d1c 100644
--- a/drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c
+++ b/drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c
@@ -1434,14 +1434,10 @@ static int dw_mipi_dsi_rockchip_probe(struct platform_device *pdev)
 		if (ret != -EPROBE_DEFER)
 			DRM_DEV_ERROR(dev,
 				      "Failed to probe dw_mipi_dsi: %d\n", ret);
-		goto err_clkdisable;
+		return ret;
 	}
 
 	return 0;
-
-err_clkdisable:
-	clk_disable_unprepare(dsi->pllref_clk);
-	return ret;
 }
 
 static int dw_mipi_dsi_rockchip_remove(struct platform_device *pdev)
-- 
2.33.0.685.g46640cef36-goog


_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip

  parent reply	other threads:[~2021-09-28 21:36 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-09-28 21:35 [PATCH v3 0/4] Fix Rockchip MIPI DSI display init timeouts Brian Norris
2021-09-28 21:35 ` Brian Norris
2021-09-28 21:35 ` [PATCH v3 1/4] drm/rockchip: dsi: Hold pm-runtime across bind/unbind Brian Norris
2021-09-28 21:35   ` Brian Norris
2021-09-29  2:27   ` Chen-Yu Tsai
2021-09-29  2:27     ` Chen-Yu Tsai
2021-09-28 21:35 ` [PATCH v3 2/4] drm/rockchip: dsi: Reconfigure hardware on resume() Brian Norris
2021-09-28 21:35   ` Brian Norris
2021-09-29  2:28   ` Chen-Yu Tsai
2021-09-29  2:28     ` Chen-Yu Tsai
2021-09-29 18:05   ` Nícolas F. R. A. Prado
2021-09-29 18:05     ` Nícolas F. R. A. Prado
2021-10-17 21:55   ` Heiko Stuebner
2021-10-17 21:55     ` Heiko Stuebner
2021-09-28 21:35 ` Brian Norris [this message]
2021-09-28 21:35   ` [PATCH v3 3/4] drm/rockchip: dsi: Fix unbalanced clock on probe error Brian Norris
2021-09-29 18:09   ` Nícolas F. R. A. Prado
2021-09-29 18:09     ` Nícolas F. R. A. Prado
2021-09-28 21:35 ` [PATCH v3 4/4] drm/rockchip: dsi: Disable PLL clock on bind error Brian Norris
2021-09-28 21:35   ` Brian Norris
2021-09-29 18:10   ` Nícolas F. R. A. Prado
2021-09-29 18:10     ` Nícolas F. R. A. Prado
2021-10-17 21:52 ` [PATCH v3 0/4] Fix Rockchip MIPI DSI display init timeouts Heiko Stuebner
2021-10-17 21:52   ` Heiko Stuebner

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210928143413.v3.3.Ie8ceefb51ab6065a1151869b6fcda41a467d4d2c@changeid \
    --to=briannorris@chromium.org \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=heiko@sntech.de \
    --cc=hjc@rock-chips.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-rockchip@lists.infradead.org \
    --cc=tommyhebb@gmail.com \
    --cc=wenst@chromium.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.