From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CAE8DC48BDF for ; Tue, 15 Jun 2021 19:58:40 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 901C7613B1 for ; Tue, 15 Jun 2021 19:58:40 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 901C7613B1 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=51pa+QwBiB1hclyQqh46iS8ObiPI/c9fgcO/nYanDZE=; b=aZVOiENRnD7183 yjlMXBx9RD6S0TSdbVOuczYGIwdevLfQtYkuzauNvtuCJ1B8g4tzXLRX31KLj7zgaSBNoFfmnLsb0 VHoZn59pm1mqcycsHpGMF/KWNAwZFpJXixrdnLC9w1+h6TIj5IMIfq0F5lVZi0iDTEB269I2xXA/M 0bWuSdAaFueEFuXJej/TO9S0RNDPWMnvSi7Qe8NdGPOpwc47zaBndLPl1ih0RpsY/1XlSCNcS24ES 3/chvyv4/2ei85Kjwtw9gMl/jhZE06NCIhutHKbU4zD59Q9it5p0zEiS3fomaelhFFJzvIOgYZwCP iqcHhUaJIMPeRgO87rUA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1ltFAe-002cGz-FM; Tue, 15 Jun 2021 19:56:24 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1ltBJA-0015wT-2v for linux-arm-kernel@bombadil.infradead.org; Tue, 15 Jun 2021 15:48:56 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Transfer-Encoding:MIME-Version :References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=DFXU9Ny5cd8S9ouoblRpIcQ6a0zVKgWPBvxW64G5v5Q=; b=Dom770MxKmJ78MX4+pF1qIwmxV MVOByXbabRCG14BTmMRLVDGFnsE5OiYAm0rC5LJtxDv2/vTh3B4abQGIrxS3si6T/G3+2UUByuj5i DPG8/QEXBc8I2/BBKdF5yVa44PqKnkGS2UXatue9n42YA2zcfEvFDZ+ekCFTl73z6b2BtuoPjA3ZT CqO1hL7HkjZTml76u5/iJIKlRcYfrNDRZ9dQpj/0dagDcrkQoIw8Uk4J2wKddhTlaFd518mtYqbw3 UTHO1TdNi/lBTtw3mi6RnKth+K+2Y82apHq+2VemTSnG7k9zQNYLLAT1ElPsh9rckef3sTyz4bDnC 9ygykhlg==; Received: from mail.kernel.org ([198.145.29.99]) by desiato.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1ltBIz-0081QN-S9 for linux-arm-kernel@lists.infradead.org; Tue, 15 Jun 2021 15:48:54 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id D66C2614A7; Tue, 15 Jun 2021 15:48:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1623772119; bh=R2z5GIrmCya7sg7LqFVvlexetXRp+JisOWiVMnKGpXU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nbi0qPJ5pahqPog4b8Ns6RIn30Etqwk64NjtMdp65dQ4ucCxaMS3KXSA4vu0vJ+oH hdT4+Ha/xFV3Fm5rB64SWJVjMt4ziaNQLO0DNWOIDIXVk2kTfptEKx7rtvWM7SwcgQ UXbTReyh0GxP7O107SoHvssufvaDowyOayTqAVBqjNqmZYfuZSTMwaRZNhP/AwOpnU I5lvPekXaGEywoz5lPgE5djzDVixjfL4eWjN73Pe0Gqdvlxp/NPk9h3IdFzGnovpLt rxKfjv5zEXKbjANQWSAGBlZ8re4L+uyEGs7qQKSGKrQ0sCG39SMs0XingCOmWBCLOk CxJCI7V6Smj4w== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: zpershuai , Mark Brown , Sasha Levin , linux-spi@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH AUTOSEL 5.12 12/33] spi: spi-zynq-qspi: Fix some wrong goto jumps & missing error code Date: Tue, 15 Jun 2021 11:48:03 -0400 Message-Id: <20210615154824.62044-12-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210615154824.62044-1-sashal@kernel.org> References: <20210615154824.62044-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210615_164852_922810_CB55C6C7 X-CRM114-Status: GOOD ( 13.64 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: zpershuai [ Upstream commit f131767eefc47de2f8afb7950cdea78397997d66 ] In zynq_qspi_probe function, when enable the device clock is done, the return of all the functions should goto the clk_dis_all label. If num_cs is not right then this should return a negative error code but currently it returns success. Signed-off-by: zpershuai Link: https://lore.kernel.org/r/1622110857-21812-1-git-send-email-zpershuai@gmail.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- drivers/spi/spi-zynq-qspi.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/spi/spi-zynq-qspi.c b/drivers/spi/spi-zynq-qspi.c index 5d8a5ee62fa2..79863c889e18 100644 --- a/drivers/spi/spi-zynq-qspi.c +++ b/drivers/spi/spi-zynq-qspi.c @@ -679,14 +679,14 @@ static int zynq_qspi_probe(struct platform_device *pdev) xqspi->irq = platform_get_irq(pdev, 0); if (xqspi->irq <= 0) { ret = -ENXIO; - goto remove_master; + goto clk_dis_all; } ret = devm_request_irq(&pdev->dev, xqspi->irq, zynq_qspi_irq, 0, pdev->name, xqspi); if (ret != 0) { ret = -ENXIO; dev_err(&pdev->dev, "request_irq failed\n"); - goto remove_master; + goto clk_dis_all; } ret = of_property_read_u32(np, "num-cs", @@ -694,8 +694,9 @@ static int zynq_qspi_probe(struct platform_device *pdev) if (ret < 0) { ctlr->num_chipselect = 1; } else if (num_cs > ZYNQ_QSPI_MAX_NUM_CS) { + ret = -EINVAL; dev_err(&pdev->dev, "only 2 chip selects are available\n"); - goto remove_master; + goto clk_dis_all; } else { ctlr->num_chipselect = num_cs; } -- 2.30.2 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel