From patchwork Tue Oct 6 01:22:37 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcin Wojtas X-Patchwork-Id: 7332901 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 7C5799F302 for ; Tue, 6 Oct 2015 01:18:55 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id EED2F20687 for ; Tue, 6 Oct 2015 01:18:53 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 097632069D for ; Tue, 6 Oct 2015 01:18:53 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZjGrn-0003hP-Ou; Tue, 06 Oct 2015 01:16:31 +0000 Received: from mail-lb0-f169.google.com ([209.85.217.169]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZjGrc-0003aP-3O for linux-arm-kernel@lists.infradead.org; Tue, 06 Oct 2015 01:16:21 +0000 Received: by lbcao8 with SMTP id ao8so67663622lbc.3 for ; Mon, 05 Oct 2015 18:15:58 -0700 (PDT) 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:in-reply-to :references; bh=VMewP+htb9nTwW1IhSO2YBh5jn7oS+tqctZv6hCzOB8=; b=XeRLDaS8Qy3yxPv6hgSj2BJG8V9Adb4QUqA5hAYlgtvi+C8it9wnfSQ/gEXPzq1GWp T8sGc+iQ5YesCt5vbgUk/1sQUd6JLuqIa45HSm/D8/ZSIuZ5T8qQmkz/aPFVFlt/Rjmb RHXixGDmZu1YQrjF8lg75T4fYj/TLM1kwtjNfqGMGZRQOkrRhWNh5HaYA8PAFiUh5AeN TGjNFeeBcTtDZPvgeTYNwvKxjfq7AyRvvbIaJJiE1RHY+Gt/7Bvs1nC27/cQQsJCe/wi 5JQEPqfikqCQ+kdcsCe+Sc9kKgHmaVcl8Idt5278yLx1UoTO/WP9DNr7TnFKELybHgX1 Wilw== X-Gm-Message-State: ALoCoQkHg5Jl6aaIYPaFJsJIHN5odlebGLYPJcsoMhgYjt7MG27YUEEx9SQa3wKanXqybQDrpX1q X-Received: by 10.112.160.138 with SMTP id xk10mr12841445lbb.119.1444094158287; Mon, 05 Oct 2015 18:15:58 -0700 (PDT) Received: from enkidu.semihalf.local (cardhu.semihalf.com. [213.17.239.108]) by smtp.gmail.com with ESMTPSA id x1sm4694780lbb.32.2015.10.05.18.15.57 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 05 Oct 2015 18:15:57 -0700 (PDT) From: Marcin Wojtas To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mmc@vger.kernel.org Subject: [PATCH 3/8] mmc: sdhci-pxav3: fix error handling of armada_38x_quirks Date: Tue, 6 Oct 2015 03:22:37 +0200 Message-Id: <1444094562-31165-4-git-send-email-mw@semihalf.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1444094562-31165-1-git-send-email-mw@semihalf.com> References: <1444094562-31165-1-git-send-email-mw@semihalf.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20151005_181620_510442_5AB0F46D X-CRM114-Status: GOOD ( 12.15 ) X-Spam-Score: -2.6 (--) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: thomas.petazzoni@free-electrons.com, andrew@lunn.ch, ulf.hansson@linaro.org, jason@lakedaemon.net, tawfik@marvell.com, jaz@semihalf.com, stable@vger.kernel.org, nadavh@marvell.com, alior@marvell.com, gregory.clement@free-electrons.com, mw@semihalf.com, sebastian.hesselbarth@gmail.com MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD, 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 In case of armada_38x_quirks error, all clocks should be cleaned-up, same as after mv_conf_mbus_windows failure. Signed-off-by: Marcin Wojtas Cc: # v4.2 Reviewed-by: Gregory CLEMENT --- drivers/mmc/host/sdhci-pxav3.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/mmc/host/sdhci-pxav3.c b/drivers/mmc/host/sdhci-pxav3.c index 89a9e49..f5edf9d 100644 --- a/drivers/mmc/host/sdhci-pxav3.c +++ b/drivers/mmc/host/sdhci-pxav3.c @@ -402,7 +402,7 @@ static int sdhci_pxav3_probe(struct platform_device *pdev) if (of_device_is_compatible(np, "marvell,armada-380-sdhci")) { ret = armada_38x_quirks(pdev, host); if (ret < 0) - goto err_clk_get; + goto err_mbus_win; ret = mv_conf_mbus_windows(pdev, mv_mbus_dram_info()); if (ret < 0) goto err_mbus_win;