Received: by 2002:a05:6a10:a841:0:0:0:0 with SMTP id d1csp1580469pxy; Fri, 23 Apr 2021 11:26:23 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyHGrVZdYJKlYCnTsJyLnUiN5wOZMhiWfUmUbBDYMGkMIQEb0c/i6018+mDV5gRNwhNLGve X-Received: by 2002:a50:e607:: with SMTP id y7mr6161413edm.18.1619202382835; Fri, 23 Apr 2021 11:26:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1619202382; cv=none; d=google.com; s=arc-20160816; b=ffSQ2vWyVlUCneiyhRJVofPSJeKBadiYIxEyvT3rOnVVnarFWtrDDElmYC2bZGNWsC 6QkyBr6Ki416PdLtQwoF0xONHOkFz01dW+aoaSE+r0V3rUfDYDFp+LGr0qPbTsx3KSF8 OPZR9VAPg0ybvWUS8oFH+w4lab/lsbEIJtaO3RIuATB9mDBLXrqtUPKYGnm/ijKIBwhn kiqmZN6VxSfZM/MHucr90sKrbGuhqnKsJImJI5m3bOaYgegK+jbld5kI2cxrSVr6/bt9 DTPRS7hFbcT853DJQ7j33gbAW3uVWwI5HhIOZqj53I8JPku2Z2NLbLEovdJrnlXWjEzo nCng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :ironport-sdr:ironport-sdr; bh=oumopOTMQ0OFqo1EVdmrPv3uqFoZCoH/CCNY2yvmxsM=; b=m1wM+cg5RdosDtLSWtqoWnta4HvsYchIFKzDcBfke7Ns9UUJjAd3DE5k211cnBloYx YpZDh0L91hvYkcWFXouV/Q4SoTNd9WcLeNXIJk8apxbMVlxTPpcalT0SJ91LKLRzjPvR W/JFKA2H9dwd6HvkFQLlcbL+/PsoxdwwPTzlutJRbmUnR37IxvjN0aDBEyFSLGxIQl3n qDU8BQyfAqVAaYkqFkCBk3aGCTPTL366Q5pnfy/M63OmPhPsa49+ED2UIt3JDNGMCXFr 1iXRRKpS8HITbIwG27DTYqFnGdDqgtSg2mnCuHApCdDqwZOzaeFdEzrV2WdJThTqmk7e 9zBg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id dp16si6661082ejc.642.2021.04.23.11.25.52; Fri, 23 Apr 2021 11:26:22 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232569AbhDWSZW (ORCPT + 99 others); Fri, 23 Apr 2021 14:25:22 -0400 Received: from mga07.intel.com ([134.134.136.100]:38428 "EHLO mga07.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229549AbhDWSZJ (ORCPT ); Fri, 23 Apr 2021 14:25:09 -0400 IronPort-SDR: Z0kkJiihfriNp0BzykQuGZFIzbn9ZCcYXJmMmoTL148IB5ie0ULP+pNoHF7PVtpEmaAneAgmv5 WMjIe9HMRMKw== X-IronPort-AV: E=McAfee;i="6200,9189,9963"; a="260067646" X-IronPort-AV: E=Sophos;i="5.82,246,1613462400"; d="scan'208";a="260067646" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga105.jf.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 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.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; -- 2.30.2