From patchwork Mon Jan 7 11:21:58 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Baltieri X-Patchwork-Id: 13879 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id DCBD123EC8 for ; Mon, 7 Jan 2013 11:25:48 +0000 (UTC) Received: from mail-vb0-f45.google.com (mail-vb0-f45.google.com [209.85.212.45]) by fiordland.canonical.com (Postfix) with ESMTP id 99BB1A1936F for ; Mon, 7 Jan 2013 11:25:48 +0000 (UTC) Received: by mail-vb0-f45.google.com with SMTP id p1so19114922vbi.18 for ; Mon, 07 Jan 2013 03:25:48 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:x-forwarded-to:x-forwarded-for:delivered-to:x-received :received-spf:x-received:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:x-gm-message-state; bh=udR1VnykdGKhHzYa48rcCOZ7ViC0FKwMRHMEqf5cSPk=; b=M9nbndxBC3DnKU1HBLfolJ3GgK6oldV9cIbRf+Tund5URAnBjkVT/4qjbu+tFFJDeN 811nY89bnbLHn3uF0QzzF2AlQD7Huokvo3rjM9bQFViWF1tn2U7sm9MeP3WhZpb25+0h /vo/oHT4hwA+ace/hes9GU057pUAo3l/TDzAKXZGkL5wnOCckPQzkR/S0rMLtj3gkz5N nvtPtUo9D4CkpFb+cp+ey2rNodkvHOhyY/xMVjHdnwxQ1mcO2Tlx8a7PPew1mSGg5nVU ncFucye2YsV0YvvwGzA86xJLtoW6Sq1giTqbAt1IwaNoJvwXsIhRYCnv3e8H9RhyN224 9wng== X-Received: by 10.220.218.197 with SMTP id hr5mr80709001vcb.8.1357557948143; Mon, 07 Jan 2013 03:25:48 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.58.145.101 with SMTP id st5csp56311veb; Mon, 7 Jan 2013 03:25:47 -0800 (PST) X-Received: by 10.180.24.198 with SMTP id w6mr8568320wif.27.1357557946083; Mon, 07 Jan 2013 03:25:46 -0800 (PST) Received: from mail-we0-f181.google.com (mail-we0-f181.google.com [74.125.82.181]) by mx.google.com with ESMTPS id dp5si10042755wib.20.2013.01.07.03.25.45 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 07 Jan 2013 03:25:46 -0800 (PST) Received-SPF: neutral (google.com: 74.125.82.181 is neither permitted nor denied by best guess record for domain of fabio.baltieri@linaro.org) client-ip=74.125.82.181; Authentication-Results: mx.google.com; spf=neutral (google.com: 74.125.82.181 is neither permitted nor denied by best guess record for domain of fabio.baltieri@linaro.org) smtp.mail=fabio.baltieri@linaro.org Received: by mail-we0-f181.google.com with SMTP id t11so9661650wey.26 for ; Mon, 07 Jan 2013 03:25:45 -0800 (PST) X-Received: by 10.180.102.170 with SMTP id fp10mr4384638wib.13.1357557945656; Mon, 07 Jan 2013 03:25:45 -0800 (PST) Received: from localhost ([2a01:2029:1:11e3:8e70:5aff:feac:ad8]) by mx.google.com with ESMTPS id i2sm11661631wiw.3.2013.01.07.03.25.40 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 07 Jan 2013 03:25:45 -0800 (PST) From: Fabio Baltieri To: Vinod Koul Cc: Dan Williams , Linus Walleij , Srinidhi Kasagar , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Fabio Baltieri Subject: [PATCH 16/16] dmaengine: set_dma40: balance clock in probe fail code Date: Mon, 7 Jan 2013 12:21:58 +0100 Message-Id: <1357557718-15676-17-git-send-email-fabio.baltieri@linaro.org> X-Mailer: git-send-email 1.7.12.1 In-Reply-To: <1357557718-15676-1-git-send-email-fabio.baltieri@linaro.org> References: <1357557718-15676-1-git-send-email-fabio.baltieri@linaro.org> X-Gm-Message-State: ALoCoQlBHh3yyWCTT2/Xl1YTvbt9JC9kLizwZOg1ghEUFWPMHw1N0+7uRkOIdPvUPoQiIDYSP685 Clock code was changed to use clk_prepare_enable in: b707c65 dma/ste_dma40: Fixup clock usage during probe but clk_disable on probe fail path was not updated. This patch fix this by using clk_disable_unprepare in place of clk_disable. Acked-by: Ulf Hansson Signed-off-by: Fabio Baltieri --- drivers/dma/ste_dma40.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/dma/ste_dma40.c b/drivers/dma/ste_dma40.c index a97bbd3..d77d41d 100644 --- a/drivers/dma/ste_dma40.c +++ b/drivers/dma/ste_dma40.c @@ -3634,7 +3634,7 @@ failure: release_mem_region(base->phy_start, base->phy_size); if (base->clk) { - clk_disable(base->clk); + clk_disable_unprepare(base->clk); clk_put(base->clk); }