From patchwork Fri Apr 23 16:34:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 12220875 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=-16.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, 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 8A5EDC433B4 for ; Fri, 23 Apr 2021 16:37:16 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (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 3B576600CD for ; Fri, 23 Apr 2021 16:37:16 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3B576600CD Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.intel.com 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=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version: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:In-Reply-To:References:List-Owner; bh=i37in9MrpB3miTx7iiStBDQUmxrJ5e0UkD1dNOhchvs=; b=aNqIkqkvTdTsPA1f7OpBGvCsCi qB0a7JI2tVITx7lH51uA1UqU6hzE93K/d7fYX1YOuaq9xDKuwtd06RMjD9RwQKwkkwxrWRU4H3+9d Lj4Yp6ZQJFGeDg9qr6vBvBw2zF42YNAVTFmZBvL0/+4HvXEW6gztQ525PTZnM1+ZlP71Z3aPnzKVp 5XR4U2QnxHB4oLuR+YhN44LfhB+bYAiAg857tv5acN41VysGuo4D3aKRpxyI1Nnuo9UfoH3BZ/Vxy JjddxifgfitzJB3yvju0Ws4LCgwNL7nCGbLtGw19S47UH4NORZAj6RWQReJ14mznXs9J6UcF6YQGo WuhJ4cuw==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lZylo-001s8I-H8; Fri, 23 Apr 2021 16:35:08 +0000 Received: from bombadil.infradead.org ([2607:7c80:54:e::133]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lZylV-001s55-Dm for linux-arm-kernel@desiato.infradead.org; Fri, 23 Apr 2021 16:34:49 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: MIME-Version:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type: Content-ID:Content-Description:In-Reply-To:References; bh=oumopOTMQ0OFqo1EVdmrPv3uqFoZCoH/CCNY2yvmxsM=; b=0p1+6CTAqw04wUHgIgkn76S1cT aAmjROPoEbA9Eu78XG7ZAorQ/mcRPPh1U8Z+EVvkenou9JN3k7EsSHiZs7XoZzTB2O3zxclYPLUu9 1WW8CIDEyx9Ylo0co3+QHds3DopeKHWPkGbHrv6uybdVYfrZT4pnvEPFW/SlXhfz8NruEcMcdkJbz vtea8sfQsFcLOK4TH19ESGsXVdzeFT94dKH5YCi1nypoMH7Shn25qm7kmNNbFVguKaCC4Fg5BY1U9 ExR5MXJ0K8+G0vCUUDUdu38vBqqhFI/YsgKQTEwKBIp6vzQkG5sgx5+W02feHoaT9CQI1csU6mmf2 U0/8M53Q==; Received: from mga09.intel.com ([134.134.136.24]) by bombadil.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lZylR-00EYGZ-Ep for linux-arm-kernel@lists.infradead.org; Fri, 23 Apr 2021 16:34:46 +0000 IronPort-SDR: OKbOayesgIUi956T7kVPyCk+0mEGpX+87MQIUCQsIlZVuoaxfWpo9hz6uiktu6QXrMgvP4J8CN 3ZRe0NfJLR5w== X-IronPort-AV: E=McAfee;i="6200,9189,9963"; a="196207746" X-IronPort-AV: E=Sophos;i="5.82,246,1613462400"; d="scan'208";a="196207746" Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Apr 2021 09:34:42 -0700 IronPort-SDR: A/GALelAqh8nmKhWf/4sYqd6s38qWEG8d4+DpCxmpFYcWce04Ax8rQd23x0+KRiW80i0WAjElK gZ4Q8dIDcA3w== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.82,246,1613462400"; d="scan'208";a="535590595" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga004.jf.intel.com with ESMTP; 23 Apr 2021 09:34:34 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id B304611E; Fri, 23 Apr 2021 19:34:51 +0300 (EEST) From: Andy Shevchenko To: Andy Shevchenko , Mark Brown , Cezary Rojewski , linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-spi@vger.kernel.org, alsa-devel@alsa-project.org Cc: Dmitry Torokhov , Daniel Mack , Haojian Zhuang , Robert Jarzmik , Pierre-Louis Bossart , Liam Girdwood , Jie Yang , Jaroslav Kysela , Takashi Iwai Subject: [PATCH v1 01/14] spi: pxa2xx: Use one point of return when ->probe() fails Date: Fri, 23 Apr 2021 19:34:24 +0300 Message-Id: <20210423163437.89306-1-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210423_093445_561399_F68762BC X-CRM114-Status: GOOD ( 12.34 ) 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: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org When we can't allocate SPI controller, jump to the error path rather than return locally. Signed-off-by: Andy Shevchenko --- drivers/spi/spi-pxa2xx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/spi/spi-pxa2xx.c b/drivers/spi/spi-pxa2xx.c index 0cc767283674..0ef22045b006 100644 --- a/drivers/spi/spi-pxa2xx.c +++ b/drivers/spi/spi-pxa2xx.c @@ -1701,8 +1701,8 @@ static int pxa2xx_spi_probe(struct platform_device *pdev) if (!controller) { dev_err(&pdev->dev, "cannot alloc spi_controller\n"); - pxa_ssp_free(ssp); - return -ENOMEM; + status = -ENOMEM; + goto out_error_controller_alloc; } drv_data = spi_controller_get_devdata(controller); drv_data->controller = controller;