From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
linux-arm-kernel@lists.infradead.org, linux-spi@vger.kernel.org,
linux-kernel@vger.kernel.org, alsa-devel@alsa-project.org
Cc: Takashi Iwai <tiwai@suse.com>,
Liam Girdwood <lgirdwood@gmail.com>,
Haojian Zhuang <haojian.zhuang@gmail.com>,
Mark Brown <broonie@kernel.org>,
Robert Jarzmik <robert.jarzmik@free.fr>,
Daniel Mack <daniel@zonque.org>
Subject: [PATCH v3 01/14] spi: pxa2xx: Use one point of return when ->probe() fails
Date: Mon, 10 May 2021 15:41:21 +0300 [thread overview]
Message-ID: <20210510124134.24638-2-andriy.shevchenko@linux.intel.com> (raw)
In-Reply-To: <20210510124134.24638-1-andriy.shevchenko@linux.intel.com>
When we can't allocate SPI controller, jump to the error path rather than
return locally.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
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 5e59ba075bc7..2f5618883ac3 100644
--- a/drivers/spi/spi-pxa2xx.c
+++ b/drivers/spi/spi-pxa2xx.c
@@ -1705,8 +1705,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
next prev parent reply other threads:[~2021-05-10 12:43 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-10 12:41 [PATCH v3 00/14] spi: pxa2xx: Set of cleanups Andy Shevchenko
2021-05-10 12:41 ` Andy Shevchenko [this message]
2021-05-10 12:41 ` [PATCH v3 02/14] spi: pxa2xx: Utilize MMIO and physical base from struct ssp_device Andy Shevchenko
2021-05-10 12:41 ` [PATCH v3 03/14] spi: pxa2xx: Utilize struct device " Andy Shevchenko
2021-05-10 12:41 ` [PATCH v3 04/14] spi: pxa2xx: Replace header inclusions by forward declarations Andy Shevchenko
2021-05-10 12:41 ` [PATCH v3 05/14] spi: pxa2xx: Unify ifdeffery used in the headers Andy Shevchenko
2021-05-10 12:41 ` [PATCH v3 06/14] spi: pxa2xx: Group Intel Quark specific definitions Andy Shevchenko
2021-05-10 12:41 ` [PATCH v3 07/14] spi: pxa2xx: Introduce int_stop_and_reset() helper Andy Shevchenko
2021-05-10 12:41 ` [PATCH v3 08/14] spi: pxa2xx: Reuse int_error_stop() in pxa2xx_spi_slave_abort() Andy Shevchenko
2021-05-10 12:41 ` [PATCH v3 09/14] spi: pxa2xx: Use pxa_ssp_enable()/pxa_ssp_disable() in the driver Andy Shevchenko
2021-05-10 12:41 ` [PATCH v3 10/14] spi: pxa2xx: Extract pxa2xx_spi_update() helper Andy Shevchenko
2021-05-10 12:41 ` [PATCH v3 11/14] spi: pxa2xx: Extract clear_SSCR1_bits() helper Andy Shevchenko
2021-05-10 12:41 ` [PATCH v3 12/14] spi: pxa2xx: Extract read_SSSR_bits() helper Andy Shevchenko
2021-05-10 12:41 ` [PATCH v3 13/14] spi: pxa2xx: Constify struct driver_data parameter Andy Shevchenko
2021-05-10 12:41 ` [PATCH v3 14/14] spi: pxa2xx: Introduce special type for Merrifield SPIs Andy Shevchenko
2021-05-11 18:21 ` (subset) [PATCH v3 00/14] spi: pxa2xx: Set of cleanups Mark Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210510124134.24638-2-andriy.shevchenko@linux.intel.com \
--to=andriy.shevchenko@linux.intel.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=daniel@zonque.org \
--cc=haojian.zhuang@gmail.com \
--cc=lgirdwood@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-spi@vger.kernel.org \
--cc=robert.jarzmik@free.fr \
--cc=tiwai@suse.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).