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: 7332781 Return-Path: X-Original-To: patchwork-linux-mmc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id A4698BF90C for ; Tue, 6 Oct 2015 01:16:28 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D8D5520687 for ; Tue, 6 Oct 2015 01:16:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E84D42069D for ; Tue, 6 Oct 2015 01:16:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751798AbbJFBQT (ORCPT ); Mon, 5 Oct 2015 21:16:19 -0400 Received: from mail-la0-f43.google.com ([209.85.215.43]:36382 "EHLO mail-la0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751487AbbJFBQA (ORCPT ); Mon, 5 Oct 2015 21:16:00 -0400 Received: by laddr2 with SMTP id dr2so17882672lad.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=Mgp2mh+Us9AZaUn8rwUCrdMdCEsHrIlhtJaUUDi7f8SViktqDrscfBAYoRpDibCN8v kEvzjJqGKKwZR2XXFzSFGMGeM1JeKYPfycc1MfAuqyp1W2XXJaNR95EBjvb/YYJlOlka RJ0V8weWmKR7eSLEAi/QfXSYSipd1CPX/9UlmSpIe2cbHNxwgF+AdZTlmw2vUs7uwROh RSnomrWijeKgYV3MJwftRuO90BCSyGozLXjK9xXWtvFiY8L/XbU1h6BCmq//OOLOQnb5 5KQ6O6O4C01XAQxP3J0oSv+wPp/MEo8FgmY9TAvvBGLNIYRWlm5CmJ56lUuhw4h1/J/A S6/A== X-Gm-Message-State: ALoCoQlDiopLrSpF56LsrhmvGBjpswyKTQDYc4CoAc+ngXHh4P5PzEPIkSr3QUOLjDhgNBZ2pPev 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 Cc: ulf.hansson@linaro.org, sebastian.hesselbarth@gmail.com, andrew@lunn.ch, jason@lakedaemon.net, thomas.petazzoni@free-electrons.com, gregory.clement@free-electrons.com, nadavh@marvell.com, alior@marvell.com, tawfik@marvell.com, mw@semihalf.com, jaz@semihalf.com, 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> Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham 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;