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: 10343571 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 10F646039A for ; Mon, 16 Apr 2018 17:16:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 009D827F94 for ; Mon, 16 Apr 2018 17:16:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E8E7E2883D; Mon, 16 Apr 2018 17:16:35 +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=-7.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8E7F52883C for ; Mon, 16 Apr 2018 17:16:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753218AbeDPRQZ (ORCPT ); Mon, 16 Apr 2018 13:16:25 -0400 Received: from heliosphere.sirena.org.uk ([172.104.155.198]:57994 "EHLO heliosphere.sirena.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753076AbeDPRQY (ORCPT ); Mon, 16 Apr 2018 13:16:24 -0400 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 Cc: Mark Brown , Mark Brown , Amelie Delaunay , Maxime Coquelin , Alexandre Torgue , linux-spi@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, ldv-project@linuxtesting.org, linux-spi@vger.kernel.org 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 Sender: linux-spi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.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);