From patchwork Mon Apr 16 17:16:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 10343573 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 4792E60542 for ; Mon, 16 Apr 2018 17:16:42 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 36B6A27F94 for ; Mon, 16 Apr 2018 17:16:42 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2B5382883D; Mon, 16 Apr 2018 17:16:42 +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=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.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 B0A8927F94 for ; Mon, 16 Apr 2018 17:16:41 +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:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Date:Message-Id: In-Reply-To:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: References:List-Owner; bh=SUisixwqazVF+uLHEFQguxkYRYzzLz92FAlfSStfpPA=; b=sUt ZvwS2HxmShUEqMW3unO4P5/31lwR+8eO1nanqH4hdaRTr45D6o3ImPp60veUrpTDYsyFV5HtHmFNt n4PKRZAJVqfGap3L9YcqVfVv4FYzr63LBjVFiFJyG/jcGXYM1+SaBclMG0j70LPfYH8c6lUIFAQLE //+SX65CZe3YseaUnQYvwdSTVqp1d7pKiuOB7idF5c8ypztf86oddCSvbFbme6PtVKmoGtYlD+9Cn lVtvhLi7V1mGKAjXufJXQiX4AN/+B0ZTVgfzFJMlfOTgXZjjs97D2GlH8xoiSLLasXzfuZaEvh1Dj jjUvM3gMsAP9Yid/IFq7vwHeQ+/nT1g==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1f87k1-0002py-Vj; Mon, 16 Apr 2018 17:16:34 +0000 Received: from heliosphere.sirena.org.uk ([2a01:7e01::f03c:91ff:fed4:a3b6]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1f87jx-0002oV-HE for linux-arm-kernel@lists.infradead.org; Mon, 16 Apr 2018 17:16:31 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sirena.org.uk; s=20170815-heliosphere; h=Date:Message-Id:In-Reply-To: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:References: List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner: List-Archive; bh=z8+919/K2yO5YqUq/JtvhZi/1SjxPmDl53IkvF1FXaM=; b=tCW54U4FXZzS E+1hCdHb0xzeuvwP8xu5xUQg/8I7QwfvNRclP3wo4A0JEts1njlgLUCL9tup4sWRCuWHxo96m+LiL ag5ueBISfu0fNktyYk6fILee0v8oOwblflu5jXnBmc0ZvtcwAVloLUMfM/Ai7wO+qpa8Gay/nP2og +Z7ys=; Received: from debutante.sirena.org.uk ([2001:470:1f1d:6b5::3] helo=debutante) by heliosphere.sirena.org.uk with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1f87jg-0005ti-Ka; Mon, 16 Apr 2018 17:16:12 +0000 Received: from broonie by debutante with local (Exim 4.90_1) (envelope-from ) id 1f87jg-000397-5U; Mon, 16 Apr 2018 18:16:12 +0100 From: Mark Brown To: Alexey Khoroshilov Subject: Applied "spi: stm32: Fix error handling in stm32_spi_probe()" to the spi tree In-Reply-To: <1522439684-7510-1-git-send-email-khoroshilov@ispras.ru> Message-Id: Date: Mon, 16 Apr 2018 18:16:12 +0100 X-Bad-Reply: In-Reply-To but no 'Re:' in Subject. X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180416_101629_729137_EEAC0328 X-CRM114-Status: GOOD ( 15.09 ) 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: ldv-project@linuxtesting.org, Amelie Delaunay , Alexandre Torgue , linux-kernel@vger.kernel.org, linux-spi@vger.kernel.org, Mark Brown , Maxime Coquelin , linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 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 The patch spi: stm32: Fix error handling in stm32_spi_probe() has been applied to the spi tree at https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark From 05799ddf74f642911d27514227b89392ba02b26f Mon Sep 17 00:00:00 2001 From: Alexey Khoroshilov Date: Fri, 30 Mar 2018 22:54:44 +0300 Subject: [PATCH] spi: stm32: Fix error handling in stm32_spi_probe() clk_get_rate() is below clk_prepare_enable(), so its error should lead to goto err_clk_disable, not to err_master_put. Found by Linux Driver Verification project (linuxtesting.org). Signed-off-by: Alexey Khoroshilov Reviewed-by: Amelie Delaunay Signed-off-by: Mark Brown --- drivers/spi/spi-stm32.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/spi/spi-stm32.c b/drivers/spi/spi-stm32.c index ba9743fa2326..ad1e55d3d5d5 100644 --- a/drivers/spi/spi-stm32.c +++ b/drivers/spi/spi-stm32.c @@ -1129,7 +1129,7 @@ static int stm32_spi_probe(struct platform_device *pdev) if (!spi->clk_rate) { dev_err(&pdev->dev, "clk rate = 0\n"); ret = -EINVAL; - goto err_master_put; + goto err_clk_disable; } spi->rst = devm_reset_control_get_exclusive(&pdev->dev, NULL);