From patchwork Fri Apr 23 18:24:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 12221297 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 851C7C433B4 for ; Fri, 23 Apr 2021 18:27:15 +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 38D5461458 for ; Fri, 23 Apr 2021 18:27:15 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 38D5461458 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: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=i37in9MrpB3miTx7iiStBDQUmxrJ5e0UkD1dNOhchvs=; b=RxE4pzS0RubEdgg8gUbNm8gOh AiZDv1ykA6VNLphJbO32anJMBB1+s7gclD4G3RN5cyRLZVKS9YzwSBU0Z2l597tzEVDXNd1KmyZk2 nY4DLagVtsfLFublshI+MsQEQP8F+XQVU6AEneQrkut/ApS+gWWIlvR776s0I/bFMh5Ffdz2UcJLs MbYwj72ke3xYRFaqic4vwHH5JDjcfQtkjFHqwqhEa8GVhvjqZmyzHV1IDVrK9oIVZrl1mL9YJW4YN SZrRTYRwuhQAZmtMrIaR5HHLkIeJRTW7pTghUb4ZuknsmcfQPydnmDVehfj9IhDoTb6VugvmMUjNU sR57WRfZw==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1la0Ts-0027I2-TZ; Fri, 23 Apr 2021 18:24:45 +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 1la0Th-0027GV-Qc for linux-arm-kernel@desiato.infradead.org; Fri, 23 Apr 2021 18:24:34 +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:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description; bh=oumopOTMQ0OFqo1EVdmrPv3uqFoZCoH/CCNY2yvmxsM=; b=Ow2PNYGab++hzM/EyN2WcOhP4g iEkm30hxtP6ykmypJItRcNNQUB2kZyqvsZU2Ki/XnepxXcGeSgF6vy+os64L9FdIWmRzj0PQ48Rfv LSjJUp/pd72DjSTqxb2O7IW5/Y23C4gtDi6AR9IN9bTbsQWqpVM3q6ocqogW6aSiZwZ/AyzQVMQnd BFKUNTfmPTIkjOKGyBP5u5nm+EVPw0NNy8ybGziACVaCosdZK98yewuHVMGLNQyUC+962gGRNyz8d I9T1PTk2n8rC7LYraCxpwxHKYfzGW4DMLVVY8gK2Wx4FK+b6dGFwtQOvfihImtsyU/soUnBAj+gjZ GojKyZEg==; Received: from mga14.intel.com ([192.55.52.115]) by bombadil.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1la0Tf-00EcNy-I6 for linux-arm-kernel@lists.infradead.org; Fri, 23 Apr 2021 18:24:32 +0000 IronPort-SDR: CzAjMIuHoN5RVhnC9iVnlKVaImhpWLhR5yySQmJZ0JgzlTss+tVJb0ejvzrjleINcjpcFQPbc3 cd+d4AO6Ebkw== X-IronPort-AV: E=McAfee;i="6200,9189,9963"; a="195669975" X-IronPort-AV: E=Sophos;i="5.82,246,1613462400"; d="scan'208";a="195669975" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Apr 2021 11:24:29 -0700 IronPort-SDR: Kw2kSwe5A3CIcIaWTXxE9t7TUlgTCX8H0nfuEK6Gxru+t3ir/qIQ96CnPanQiOIqqa/DYjMWY5 yxI5GtwC0uEA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.82,246,1613462400"; d="scan'208";a="385169376" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga003.jf.intel.com with ESMTP; 23 Apr 2021 11:24:26 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id DC14141; Fri, 23 Apr 2021 21:24:44 +0300 (EEST) From: Andy Shevchenko To: Andy Shevchenko , linux-arm-kernel@lists.infradead.org, linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org, alsa-devel@alsa-project.org Cc: Daniel Mack , Haojian Zhuang , Robert Jarzmik , Mark Brown , Liam Girdwood , Jaroslav Kysela , Takashi Iwai Subject: [PATCH v2 01/14] spi: pxa2xx: Use one point of return when ->probe() fails Date: Fri, 23 Apr 2021 21:24:28 +0300 Message-Id: <20210423182441.50272-2-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210423182441.50272-1-andriy.shevchenko@linux.intel.com> References: <20210423182441.50272-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210423_112431_612114_6433ED76 X-CRM114-Status: GOOD ( 13.05 ) 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;