Received: by 2002:a05:6a10:f3d0:0:0:0:0 with SMTP id a16csp2827439pxv; Mon, 12 Jul 2021 02:56:31 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzW3/WlXQWdeVWeExfEVGvN3F2JmQRh45SvzSWdigOoNUIFESE1K1WZv74g3Y6Me9m/lr/E X-Received: by 2002:a05:6402:22e1:: with SMTP id dn1mr28141177edb.8.1626083791003; Mon, 12 Jul 2021 02:56:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626083790; cv=none; d=google.com; s=arc-20160816; b=ojq/Tyxb0DnUwf8wURM8RHp94o//aZeKyRTKqMuQoHO0Idf+aEORZwzEZ2bvEs9lWk Uxg3m2Qml9RY4mLvPlsMqy35v7Lg5zbPgC8XAujbkEjMeh6rGpz8yC5Lb264ljs1ZF9g lw1aP0FuzMpo9RtJTHX/41xbwaREsHNA198uE3it/kQDMoA9M9oqLF7Z1GksoBHgjgNm tlqUtsRwp4engbIopkn/p2CThJK80a2scRwxtHUGMFZCHCgIau134vc4W/RT7qqDbEz8 UU6M6/WOFNKVanW59c6s2oogTwDjI1yB4uYIBnw0ukZI8LKYDV9hxKxzQ98Q/kYQP9V6 mJoQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=rD17c67dnIxPFqaZww4b7/pRsn7L1Dbkvr2U09VqjTs=; b=Lxz8GOlridma7XT03UMHJaXQ2f/NV9ujHW/shTkXEYAYdy8wWV6fgU6PM7m6UncwVv 1C7dmUq3YEK3aW+nb4FlPrs8xU66HSSF+r1ffpHb6rndR5VcFJsF/NsYviKt36K9urzb uprxB0AAXmT1IVBhnDdoGOumM65pNXKZyGiXBFA9lCGspywJO9akLBgtMLWNnuel/S0a R/zxYnziQLF4JsWXOW6ZbJiLMhWpKxT9yVf6Vb4Fry+MrZUG0Fwt1xpj5L/cJd65CQng Kt+ECb4rWgH0+l3doa6aEiS99iIHTA+aW29+M/I4a2mQDbNwCV93A1tZKYp7akkHfkaN eEqw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=c67+3fnu; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id eb21si17024380ejc.254.2021.07.12.02.56.08; Mon, 12 Jul 2021 02:56:30 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=c67+3fnu; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241867AbhGLG7e (ORCPT + 99 others); Mon, 12 Jul 2021 02:59:34 -0400 Received: from mail.kernel.org ([198.145.29.99]:41508 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238852AbhGLGoY (ORCPT ); Mon, 12 Jul 2021 02:44:24 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 9C91F611AD; Mon, 12 Jul 2021 06:40:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626072009; bh=zaS61qxelV4ai8TDO50YLAGe/WQFT3qtYWqPKSLj+9U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=c67+3fnuN6Sn+g79N1blPM3q3WnpcGn5oA51UzasLjPQ7rv4YiDVIm4xV6MaBZSCr 4mMwOMd49yZe1VqVZl2FX+WILhhN2zNhO30AvC8c0I4lG/B8Bo61nPCTeeY8PLtegC 0XX6Dj1Yh/T7w/0g6hGEQmrTV1SHVSMuaB9xdLHM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Hulk Robot , Yang Yingliang , Heiko Stuebner , Sasha Levin Subject: [PATCH 5.10 315/593] drm/rockchip: cdn-dp-core: add missing clk_disable_unprepare() on error in cdn_dp_grf_write() Date: Mon, 12 Jul 2021 08:07:55 +0200 Message-Id: <20210712060920.038816866@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210712060843.180606720@linuxfoundation.org> References: <20210712060843.180606720@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Yang Yingliang [ Upstream commit ae41d925c75b53798f289c69ee8d9f7d36432f6d ] After calling clk_prepare_enable(), clk_disable_unprepare() need be called when calling regmap_write() failed. Fixes: 1a0f7ed3abe2 ("drm/rockchip: cdn-dp: add cdn DP support for rk3399") Reported-by: Hulk Robot Signed-off-by: Yang Yingliang Signed-off-by: Heiko Stuebner Link: https://patchwork.freedesktop.org/patch/msgid/20210519134928.2696617-1-yangyingliang@huawei.com Signed-off-by: Sasha Levin --- drivers/gpu/drm/rockchip/cdn-dp-core.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/gpu/drm/rockchip/cdn-dp-core.c b/drivers/gpu/drm/rockchip/cdn-dp-core.c index a4a45daf93f2..6802d9b65f82 100644 --- a/drivers/gpu/drm/rockchip/cdn-dp-core.c +++ b/drivers/gpu/drm/rockchip/cdn-dp-core.c @@ -73,6 +73,7 @@ static int cdn_dp_grf_write(struct cdn_dp_device *dp, ret = regmap_write(dp->grf, reg, val); if (ret) { DRM_DEV_ERROR(dp->dev, "Could not write to GRF: %d\n", ret); + clk_disable_unprepare(dp->grf_clk); return ret; } -- 2.30.2