From patchwork Tue Oct 3 05:19:24 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vignesh Raghavendra X-Patchwork-Id: 9981687 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 6AF4560375 for ; Tue, 3 Oct 2017 05:23:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5F8C62870F for ; Tue, 3 Oct 2017 05:23:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 52D8E288A2; Tue, 3 Oct 2017 05:23:06 +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.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id DF2B02870F for ; Tue, 3 Oct 2017 05:23:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=roHRUfM14dmet6raN9pmoG52CmsuTd9gw8KeRK2q/Ns=; b=lttSaYNwUIDg/0 aW8+Akyq7SaXe9BXrxorgqqqyIumpcCd4q2js5Nm7+ViSWtoUQ5vwJDU+Ko01yCyhwPyNDXB+O7R8 rfXTSVokFp9LiIuXky7vgMlwPMHyqXgPYUaDCSXLo+lc9iODHvq+p+knCrMECK+xwJblj+/xQVXA2 qH7jHcf+TURrVQcHKpV7KX+Tdt664hmdFZc7VkO6aucd5iJgq86fMh0Dk5capfjaHFG6O0HUUa38o ltjAvmKwjUVmsooQDPMYtzCU1k9Mn46bBYvo2x5i9ymDis96VpSZOll+uf/pTbwd0U9YnsGX4i2bL EYzu9ZTC4AvxHJwXiaHA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1dzFfZ-0000Vz-Nb; Tue, 03 Oct 2017 05:23:01 +0000 Received: from fllnx209.ext.ti.com ([198.47.19.16]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dzFdd-0006zD-Uv; Tue, 03 Oct 2017 05:22:08 +0000 Received: from dflxv15.itg.ti.com ([128.247.5.124]) by fllnx209.ext.ti.com (8.15.1/8.15.1) with ESMTP id v935JPkL028700; Tue, 3 Oct 2017 00:19:25 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ti.com; s=ti-com-17Q1; t=1507007965; bh=taR/NLWvXJIp4tNJcw55/6SCGwqNAsbUeIW3VQcoD3Q=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=PL7EoNqdN6VbLwvgo9ctexIvn2HTrS20zsMVqTpjU39pBuUUX2tFBcCWpEH0TVAOT FJnp3yEGmGEtnY7kwJpmASrMQHEOtAEHcE7OtsJZYNqb/8QJlrBh+bPsvL8p8x1rN9 P959rMHadISBbmZi2i/fWkFqzHoC0N96FRBQFXaE= Received: from DLEE112.ent.ti.com (dlee112.ent.ti.com [157.170.170.23]) by dflxv15.itg.ti.com (8.14.3/8.13.8) with ESMTP id v935JK3L025858; Tue, 3 Oct 2017 00:19:20 -0500 Received: from DLEE109.ent.ti.com (157.170.170.41) by DLEE112.ent.ti.com (157.170.170.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.1.845.34; Tue, 3 Oct 2017 00:19:20 -0500 Received: from dlep32.itg.ti.com (157.170.170.100) by DLEE109.ent.ti.com (157.170.170.41) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.845.34 via Frontend Transport; Tue, 3 Oct 2017 00:19:20 -0500 Received: from a0132425.india.ti.com (ileax41-snat.itg.ti.com [10.172.224.153]) by dlep32.itg.ti.com (8.14.3/8.13.8) with ESMTP id v935IxHh003069; Tue, 3 Oct 2017 00:19:17 -0500 From: Vignesh R To: Marek Vasut , Cyrille Pitchen Subject: [PATCH v4 5/6] mtd: spi-nor: cadence-quadspi: Fix error path in probe Date: Tue, 3 Oct 2017 10:49:24 +0530 Message-ID: <20171003051925.8821-6-vigneshr@ti.com> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20171003051925.8821-1-vigneshr@ti.com> References: <20171003051925.8821-1-vigneshr@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20171002_222103_193017_8F50FD34 X-CRM114-Status: UNSURE ( 7.71 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Boris Brezillon , Vignesh R , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Rob Herring , linux-mtd@lists.infradead.org, Brian Norris , David Woodhouse , linux-arm-kernel Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Fix the reversed goto labels, so that we disable cqspi controller only if its enabled previously. This is a minor cleanup. Signed-off-by: Vignesh R --- drivers/mtd/spi-nor/cadence-quadspi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/mtd/spi-nor/cadence-quadspi.c b/drivers/mtd/spi-nor/cadence-quadspi.c index d9629e8f4798..60b557e00cfb 100644 --- a/drivers/mtd/spi-nor/cadence-quadspi.c +++ b/drivers/mtd/spi-nor/cadence-quadspi.c @@ -1255,9 +1255,9 @@ static int cqspi_probe(struct platform_device *pdev) } return ret; -probe_irq_failed: - cqspi_controller_enable(cqspi, 0); probe_setup_failed: + cqspi_controller_enable(cqspi, 0); +probe_irq_failed: clk_disable_unprepare(cqspi->clk); return ret; }