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=-19.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable 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 A2430C49361 for ; Tue, 15 Jun 2021 15:50:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 815A161627 for ; Tue, 15 Jun 2021 15:50:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232272AbhFOPxB (ORCPT ); Tue, 15 Jun 2021 11:53:01 -0400 Received: from mail.kernel.org ([198.145.29.99]:45708 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232105AbhFOPv0 (ORCPT ); Tue, 15 Jun 2021 11:51:26 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 922F16148E; Tue, 15 Jun 2021 15:49:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1623772162; bh=R2z5GIrmCya7sg7LqFVvlexetXRp+JisOWiVMnKGpXU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=R37UBIH/NmonYakUCO1inhDcL6FUTs6hQGt2XHXzpE85VHUaDEaL9mwAF8Q1qaq6J C6kEpeOZ2U1gi/zmw3whDY7YZvuelfEBO53RPE+0/cDrKf+fSC4uci/ZuZxoXiyShp qO3VF0b7b45Y2LROivcRpgJ7yhgIBU5R6adxksFnsMTJMkwFYOHAcOSQTAVYPav9dt vtRdyiGQOhPf4q2URlUETOeXULJYQCxf3Stqt+tyAWCl8x1X8mntfzUFvUeokf/Nl3 TS1MwnqxegMveENF8+Lo8oCWSkPKF41ZC+j6XlW/AKWJuFTWhnRCov/KaPAMY+GxUF pUsprxIX8gfHg== 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.10 11/30] spi: spi-zynq-qspi: Fix some wrong goto jumps & missing error code Date: Tue, 15 Jun 2021 11:48:48 -0400 Message-Id: <20210615154908.62388-11-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210615154908.62388-1-sashal@kernel.org> References: <20210615154908.62388-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.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 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 02295C48BDF for ; Tue, 15 Jun 2021 20:03:45 +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 C7C35600EF for ; Tue, 15 Jun 2021 20:03:44 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C7C35600EF 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=PGwoFiGCfFfTMx m8/Hdd27DVmLH3jgN0nqsVg4xqv/iPRJ8B+j3T8w0bz3IFsJXeHD7oP1ZY0PvJzzaviWjXeE/fAx4 nJcXnNmya+PHe/LhGOYfQW/BJJqqhErfSiWvZ3TGsSNYk/3isiygvAxXYcGn5Qp8u9jfwUOd3PwRp zV2EUb4kxM+EnTPKhavqh9R4fk8CIU7UZcqEUkEOwXDEy1wevYutQOO50/x6iQXEksZb6B2PMBiE3 QBKXuD84DaCdOGzDPGQY3aGnON5i9waBby/VXSLmqDLw9LvVaXXUSQpVkGzXHoBM0oPPr3qjGeoGR kos5mj4VN3+RYGMbUUWg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1ltFFs-002e41-IU; Tue, 15 Jun 2021 20:01:49 +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 1ltBJk-0016DP-6b for linux-arm-kernel@bombadil.infradead.org; Tue, 15 Jun 2021 15:49:32 +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=VJh5h5Jxl7oy3ucAHJ42zgr0qp 4DMTghAY5ITyhiUlcCsr8ygMHx6FUVz4d1Gsj9XOWTjx9Qnbq12c7U2zZY5pLqIAtSec5Quwm31vM EyTRo3EdHUePV+okbhVtlkBlCKRUb5N9EjO6zrwiEBm6k17KkY5G/gd4056ssaIm9BUfmSAorCx+4 SCkvU0rJy3BWQX5MC3Z6nmz76ZL+dAVuuCrWvTJuw8sPqG3sD9HJVpNNMnMmxwra5W/hXg+FBt0W2 Oozw+vQPIPqZNMKDpcQlyKXpry78xBPv2kXncQa/+h1VCa1yvAgddGWoBN5IloEa7mr31ER44XZY4 ali421rg==; Received: from mail.kernel.org ([198.145.29.99]) by desiato.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1ltBJZ-0081Sy-JO for linux-arm-kernel@lists.infradead.org; Tue, 15 Jun 2021 15:49:30 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id 922F16148E; Tue, 15 Jun 2021 15:49:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1623772162; bh=R2z5GIrmCya7sg7LqFVvlexetXRp+JisOWiVMnKGpXU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=R37UBIH/NmonYakUCO1inhDcL6FUTs6hQGt2XHXzpE85VHUaDEaL9mwAF8Q1qaq6J C6kEpeOZ2U1gi/zmw3whDY7YZvuelfEBO53RPE+0/cDrKf+fSC4uci/ZuZxoXiyShp qO3VF0b7b45Y2LROivcRpgJ7yhgIBU5R6adxksFnsMTJMkwFYOHAcOSQTAVYPav9dt vtRdyiGQOhPf4q2URlUETOeXULJYQCxf3Stqt+tyAWCl8x1X8mntfzUFvUeokf/Nl3 TS1MwnqxegMveENF8+Lo8oCWSkPKF41ZC+j6XlW/AKWJuFTWhnRCov/KaPAMY+GxUF pUsprxIX8gfHg== 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.10 11/30] spi: spi-zynq-qspi: Fix some wrong goto jumps & missing error code Date: Tue, 15 Jun 2021 11:48:48 -0400 Message-Id: <20210615154908.62388-11-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210615154908.62388-1-sashal@kernel.org> References: <20210615154908.62388-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_164928_677469_FC5234CA X-CRM114-Status: GOOD ( 13.25 ) 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