From patchwork Mon Sep 5 19:33:09 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 9315099 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 04E9F607D3 for ; Mon, 5 Sep 2016 19:33:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EB3892851A for ; Mon, 5 Sep 2016 19:33:30 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DE5F6285DA; Mon, 5 Sep 2016 19:33:30 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 858912851A for ; Mon, 5 Sep 2016 19:33:30 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0DF836E22B; Mon, 5 Sep 2016 19:33:30 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qt0-x241.google.com (mail-qt0-x241.google.com [IPv6:2607:f8b0:400d:c0d::241]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5922B6E50D for ; Mon, 5 Sep 2016 19:33:28 +0000 (UTC) Received: by mail-qt0-x241.google.com with SMTP id e5so3366536qtb.1 for ; Mon, 05 Sep 2016 12:33:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=IMT+uJ0qDcBbH0wDWLX9ezqv71yqkWxrbmlEltB5t9Q=; b=qHSHyhdX5jAO8C44FdGve2xeHWznFOg4RsGp9rm2e+wX6A72itgSHwBwvgZFHjDrLV ovL8TlLPumhHRyZokumxASahorU6aM2rwNTBRvxuFIAlUOXnDGzJ1Elk1XJb7OtaRxV4 OoO9nKqlqjuikvZvVAh9yLczui5SOKhmFEFwQ5yU1WuHZe+sE/QUA2A3ef2UFYOPxOc6 3EZbHrzLcS4cl+j1UzZ/nSB36F5cX+NONf2q95UKLgvtyyJq6UnvUfPe8loOBiP6ArTw IXiMtkmBLGFT0rmhpY7A8koRVK5WZtKlYGjDll1dmbdrq2LBlBWW9YiUiIVjMXgp8DO2 iQEA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=IMT+uJ0qDcBbH0wDWLX9ezqv71yqkWxrbmlEltB5t9Q=; b=lvG+bCaaKfitiGooXniv0gKkOeUsZgfKtKZSEa5/mHMdbpFzcl+Hswd3THUOMnmiCC gmjCDcQF1Dmg/gsG/aB/GeGEQI91roP2W6h2rRx3wncbGVVRw3IIZwGbMMb4sij0PQf6 lIyRedF831WBBYi4YO2PkcVFe9COqkccEkCi67vSZhS9dI/l+tfQ95Y7vA7ejpxt5u4b tdYh8mxnnKrWaJu+UxI5TnpRubALb94ElrmkQoJ4vBXDDQeIKmqJQeNGUW+4ExA130lY aOnCc9tXxTGucw/URb6AGRE932nFJWRVkjwrmQHY/FvafrHy1hc30yEgvw51f38q8g7X 2D9w== X-Gm-Message-State: AE9vXwPdanbl03d7dl9HzKJkOjkyg/mlNPKp5/YuBXg+vmjJe7KLPBBEJxVL2nlV8TPy/Q== X-Received: by 10.200.44.115 with SMTP id e48mr40597227qta.64.1473104007444; Mon, 05 Sep 2016 12:33:27 -0700 (PDT) Received: from localhost.localdomain ([187.180.186.110]) by smtp.gmail.com with ESMTPSA id y4sm15500546qtb.33.2016.09.05.12.33.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 05 Sep 2016 12:33:26 -0700 (PDT) From: Fabio Estevam To: stefan@agner.ch Subject: [PATCH RESEND] drm/fsl-dcu: disable clock on error path Date: Mon, 5 Sep 2016 16:33:09 -0300 Message-Id: <1473103989-16215-1-git-send-email-festevam@gmail.com> X-Mailer: git-send-email 1.9.1 Cc: Fabio Estevam , dri-devel@lists.freedesktop.org X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Fabio Estevam In fsl_dcu_drm_pm_resume() we should disable the previously enabled clock (fsl_dev->clk) when enabling fsl_dev->pix_clk fails. Signed-off-by: Fabio Estevam --- drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c index 7882387..76ae558 100644 --- a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c +++ b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c @@ -270,7 +270,7 @@ static int fsl_dcu_drm_pm_resume(struct device *dev) ret = clk_prepare_enable(fsl_dev->pix_clk); if (ret < 0) { dev_err(dev, "failed to enable pix clk\n"); - return ret; + goto disable_dcu_clk; } fsl_dcu_drm_init_planes(fsl_dev->drm); @@ -284,6 +284,10 @@ static int fsl_dcu_drm_pm_resume(struct device *dev) enable_irq(fsl_dev->irq); return 0; + +disable_dcu_clk: + clk_disable_unprepare(fsl_dev->clk); + return ret; } #endif