Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753468AbdFVR4v (ORCPT ); Thu, 22 Jun 2017 13:56:51 -0400 Received: from anholt.net ([50.246.234.109]:60374 "EHLO anholt.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751677AbdFVR4k (ORCPT ); Thu, 22 Jun 2017 13:56:40 -0400 From: Eric Anholt To: dri-devel@lists.freedesktop.org, Philippe CORNU , Alexandre Torgue , Yannick Fertre Cc: linux-kernel@vger.kernel.org, Eric Anholt Subject: [PATCH 1/2] drm/stm: Fix leak of pixel clock enable in some error paths. Date: Thu, 22 Jun 2017 10:56:35 -0700 Message-Id: <20170622175636.22723-1-eric@anholt.net> X-Mailer: git-send-email 2.11.0 In-Reply-To: <1497889685-27349-2-git-send-email-philippe.cornu@st.com> References: <1497889685-27349-2-git-send-email-philippe.cornu@st.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1452 Lines: 53 The clock gets enabled early on in init, since it's required in order to read registers. If only devm_clk_prepare_enable() was a thing! Signed-off-by: Eric Anholt --- This fixup, if you like, I would slip in before patch 1 of your series. drivers/gpu/drm/stm/ltdc.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/stm/ltdc.c b/drivers/gpu/drm/stm/ltdc.c index 8aa05860029f..7d7e889f09c3 100644 --- a/drivers/gpu/drm/stm/ltdc.c +++ b/drivers/gpu/drm/stm/ltdc.c @@ -908,13 +908,15 @@ int ltdc_load(struct drm_device *ddev) if (of_address_to_resource(np, 0, &res)) { DRM_ERROR("Unable to get resource\n"); - return -ENODEV; + ret = -ENODEV; + goto err; } ldev->regs = devm_ioremap_resource(dev, &res); if (IS_ERR(ldev->regs)) { DRM_ERROR("Unable to get ltdc registers\n"); - return PTR_ERR(ldev->regs); + ret = PTR_ERR(ldev->regs); + goto err; } for (i = 0; i < MAX_IRQ; i++) { @@ -927,7 +929,7 @@ int ltdc_load(struct drm_device *ddev) dev_name(dev), ddev); if (ret) { DRM_ERROR("Failed to register LTDC interrupt\n"); - return ret; + goto err; } } @@ -942,7 +944,7 @@ int ltdc_load(struct drm_device *ddev) if (ret) { DRM_ERROR("hardware identifier (0x%08x) not supported!\n", ldev->caps.hw_version); - return ret; + goto err; } DRM_INFO("ltdc hw version 0x%08x - ready\n", ldev->caps.hw_version); -- 2.11.0