From patchwork Mon Oct 21 05:38:34 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Yongjun X-Patchwork-Id: 3078271 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 09DA59F2B8 for ; Mon, 21 Oct 2013 14:39:23 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 04C522030E for ; Mon, 21 Oct 2013 14:39:22 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id EE08A20306 for ; Mon, 21 Oct 2013 14:39:20 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C0CE5E7268 for ; Mon, 21 Oct 2013 07:39:20 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-bk0-f42.google.com (mail-bk0-f42.google.com [209.85.214.42]) by gabe.freedesktop.org (Postfix) with ESMTP id 63740E5EF1 for ; Sun, 20 Oct 2013 22:38:35 -0700 (PDT) Received: by mail-bk0-f42.google.com with SMTP id my10so550456bkb.15 for ; Sun, 20 Oct 2013 22:38:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:date:message-id:subject:from:to:cc:content-type; bh=GrCSIrMsObRUuPvl829cMtDqxtsSmVdIxKItCqaUs+g=; b=AUgVG751D65LSuPH/U51tYiUA0uQVDtLWkUfcBo6NLAgqdVB1ZMoQ978Y9B1ACl/g3 T1SNorXqk/Y8HfCB2J3Mnab0MuYVkumcGr3nx2RUJgAdscrrmlJOcOwDN2FPbTliBe4n iyFIsm2V9eouq9zSvtzAT73y2ScCwQhBiCcbxz0OtqHwfcyVTQFDyFpWm+iB6VBZNE8c Rfv0Km5bEIoXhIo4ukKgQeDNknkgaRSxK2wnV/RPxSbR9sRjT4TO+nXF62QIDf/5IIuk OfnRcbrERpsYA8lVcHhHxU3SJ+BTGgzk8ttu9nYRNgPnEsbu3La4+hHmXR4NzXwAgg7R iLVA== MIME-Version: 1.0 X-Received: by 10.204.69.202 with SMTP id a10mr50087bkj.36.1382333914259; Sun, 20 Oct 2013 22:38:34 -0700 (PDT) Received: by 10.205.19.10 with HTTP; Sun, 20 Oct 2013 22:38:34 -0700 (PDT) Date: Mon, 21 Oct 2013 13:38:34 +0800 Message-ID: Subject: [PATCH -next] drm/tegra: add missing clk_disable_unprepare() on error in gr2d_probe() From: Wei Yongjun To: thierry.reding@gmail.com, tbergstrom@nvidia.com, airlied@linux.ie, swarren@wwwdotorg.org, grant.likely@linaro.org, rob.herring@calxeda.com X-Mailman-Approved-At: Mon, 21 Oct 2013 07:34:39 -0700 Cc: linux-tegra@vger.kernel.org, yongjun_wei@trendmicro.com.cn, dri-devel@lists.freedesktop.org X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org Errors-To: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org X-Spam-Status: No, score=-4.5 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Wei Yongjun Add the missing clk_disable_unprepare() before return from gr2d_probe() in the error handling case. Signed-off-by: Wei Yongjun Reviewed-by: Terje Bergstrom --- drivers/gpu/drm/tegra/gr2d.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/gpu/drm/tegra/gr2d.c b/drivers/gpu/drm/tegra/gr2d.c index 73b79ba..7f4eb11 100644 --- a/drivers/gpu/drm/tegra/gr2d.c +++ b/drivers/gpu/drm/tegra/gr2d.c @@ -186,6 +186,7 @@ static int gr2d_probe(struct platform_device *pdev) err = host1x_client_register(&gr2d->client.base); if (err < 0) { dev_err(dev, "failed to register host1x client: %d\n", err); + clk_disable_unprepare(gr2d->clk); return err; }