From: "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>
To: Mark Brown <broonie@kernel.org>
Cc: linux-spi@vger.kernel.org, kernel@pengutronix.de,
linux-kernel@vger.kernel.org,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
linux-fbdev@vger.kernel.org, Noralf Tronnes <notro@tronnes.org>,
linux-staging@lists.linux.dev, dri-devel@lists.freedesktop.org,
Thomas Petazzoni <thomas.petazzoni@bootlin.com>,
Heiner Kallweit <hkallweit1@gmail.com>
Subject: [PATCH 1/5] staging: fbtft: Fix error path in fbtft_driver_module_init()
Date: Sun, 23 Jan 2022 18:51:57 +0100 [thread overview]
Message-ID: <20220123175201.34839-2-u.kleine-koenig@pengutronix.de> (raw)
In-Reply-To: <20220123175201.34839-1-u.kleine-koenig@pengutronix.de>
If registering the platform driver fails, the function must not return
without undoing the spi driver registration first.
Fixes: c296d5f9957c ("staging: fbtft: core support")
Link: https://lore.kernel.org/r/20220118181338.207943-1-u.kleine-koenig@pengutronix.de
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
---
drivers/staging/fbtft/fbtft.h | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/drivers/staging/fbtft/fbtft.h b/drivers/staging/fbtft/fbtft.h
index 4cdec34e23d2..55677efc0138 100644
--- a/drivers/staging/fbtft/fbtft.h
+++ b/drivers/staging/fbtft/fbtft.h
@@ -334,7 +334,10 @@ static int __init fbtft_driver_module_init(void) \
ret = spi_register_driver(&fbtft_driver_spi_driver); \
if (ret < 0) \
return ret; \
- return platform_driver_register(&fbtft_driver_platform_driver); \
+ ret = platform_driver_register(&fbtft_driver_platform_driver); \
+ if (ret < 0) \
+ spi_unregister_driver(&fbtft_driver_spi_driver); \
+ return ret; \
} \
\
static void __exit fbtft_driver_module_exit(void) \
--
2.34.1
WARNING: multiple messages have this Message-ID (diff)
From: "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>
To: Mark Brown <broonie@kernel.org>
Cc: linux-fbdev@vger.kernel.org,
Thomas Petazzoni <thomas.petazzoni@bootlin.com>,
Noralf Tronnes <notro@tronnes.org>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org,
dri-devel@lists.freedesktop.org, linux-spi@vger.kernel.org,
kernel@pengutronix.de, Heiner Kallweit <hkallweit1@gmail.com>
Subject: [PATCH 1/5] staging: fbtft: Fix error path in fbtft_driver_module_init()
Date: Sun, 23 Jan 2022 18:51:57 +0100 [thread overview]
Message-ID: <20220123175201.34839-2-u.kleine-koenig@pengutronix.de> (raw)
In-Reply-To: <20220123175201.34839-1-u.kleine-koenig@pengutronix.de>
If registering the platform driver fails, the function must not return
without undoing the spi driver registration first.
Fixes: c296d5f9957c ("staging: fbtft: core support")
Link: https://lore.kernel.org/r/20220118181338.207943-1-u.kleine-koenig@pengutronix.de
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
---
drivers/staging/fbtft/fbtft.h | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/drivers/staging/fbtft/fbtft.h b/drivers/staging/fbtft/fbtft.h
index 4cdec34e23d2..55677efc0138 100644
--- a/drivers/staging/fbtft/fbtft.h
+++ b/drivers/staging/fbtft/fbtft.h
@@ -334,7 +334,10 @@ static int __init fbtft_driver_module_init(void) \
ret = spi_register_driver(&fbtft_driver_spi_driver); \
if (ret < 0) \
return ret; \
- return platform_driver_register(&fbtft_driver_platform_driver); \
+ ret = platform_driver_register(&fbtft_driver_platform_driver); \
+ if (ret < 0) \
+ spi_unregister_driver(&fbtft_driver_spi_driver); \
+ return ret; \
} \
\
static void __exit fbtft_driver_module_exit(void) \
--
2.34.1
next prev parent reply other threads:[~2022-01-23 17:52 UTC|newest]
Thread overview: 73+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-23 17:51 [PATCH 0/5] spi: make remove callback a void function Uwe Kleine-König
2022-01-23 17:51 ` Uwe Kleine-König
2022-01-23 17:51 ` Uwe Kleine-König
2022-01-23 17:51 ` Uwe Kleine-König [this message]
2022-01-23 17:51 ` [PATCH 1/5] staging: fbtft: Fix error path in fbtft_driver_module_init() Uwe Kleine-König
2022-01-23 17:51 ` [PATCH 2/5] staging: fbtft: Deduplicate driver registration macros Uwe Kleine-König
2022-01-23 17:51 ` Uwe Kleine-König
2022-01-27 21:36 ` Uwe Kleine-König
2022-01-27 21:36 ` Uwe Kleine-König
2022-01-28 7:16 ` Greg Kroah-Hartman
2022-01-28 7:16 ` Greg Kroah-Hartman
2022-01-23 17:51 ` [PATCH 3/5] tpm: st33zp24: Make st33zp24_remove() a void function Uwe Kleine-König
2022-01-23 17:52 ` [PATCH 4/5] platform/chrome: cros_ec: Make cros_ec_unregister() return void Uwe Kleine-König
2022-01-23 17:52 ` [PATCH 5/5] spi: make remove callback a void function Uwe Kleine-König
2022-01-23 17:52 ` Uwe Kleine-König
2022-01-23 17:52 ` Uwe Kleine-König
2022-01-23 22:49 ` Marc Kleine-Budde
2022-01-24 12:23 ` Andy Shevchenko
2022-01-24 12:23 ` Andy Shevchenko
2022-01-24 12:23 ` Andy Shevchenko
2022-01-24 12:23 ` Andy Shevchenko
2022-01-25 9:35 ` Alexandre Belloni
2022-01-25 9:35 ` Alexandre Belloni
2022-01-25 9:35 ` Alexandre Belloni
2022-01-25 9:35 ` Alexandre Belloni
2022-01-25 9:44 ` Stefan Schmidt
2022-01-25 9:44 ` Stefan Schmidt
2022-01-25 9:44 ` Stefan Schmidt
2022-01-25 9:44 ` Stefan Schmidt
2022-01-25 9:47 ` Jonathan Cameron
2022-01-25 9:47 ` Jonathan Cameron
2022-01-25 9:47 ` Jonathan Cameron
2022-01-25 9:47 ` Jonathan Cameron
2022-01-25 10:29 ` Uwe Kleine-König
2022-01-25 10:29 ` Uwe Kleine-König
2022-01-25 10:29 ` Uwe Kleine-König
2022-01-25 10:29 ` Uwe Kleine-König
2022-01-25 10:19 ` Miquel Raynal
2022-01-25 10:19 ` Miquel Raynal
2022-01-25 10:19 ` Miquel Raynal
2022-01-25 10:19 ` Miquel Raynal
2022-01-25 10:25 ` Claudius Heine
2022-01-25 10:25 ` Claudius Heine
2022-01-25 10:25 ` Claudius Heine
2022-01-25 10:25 ` Claudius Heine
2022-01-25 10:37 ` Geert Uytterhoeven
2022-01-25 10:37 ` Geert Uytterhoeven
2022-01-25 10:37 ` Geert Uytterhoeven
2022-01-25 10:37 ` Geert Uytterhoeven
[not found] ` <CGME20220125124340eucas1p2504c36206c5c17f63663a814fc8f7feb@eucas1p2.samsung.com>
2022-01-25 12:43 ` Lukasz Stelmach
2022-01-25 14:16 ` Jérôme Pouiller
2022-01-25 14:16 ` Jérôme Pouiller
2022-01-25 14:16 ` Jérôme Pouiller
2022-01-27 11:39 ` Ulf Hansson
2022-01-27 13:41 ` Marcus Folkesson
2022-02-08 13:39 ` Mark Brown
2022-02-08 13:39 ` Mark Brown
2022-02-08 13:39 ` Mark Brown
2022-02-08 13:39 ` Mark Brown
2022-02-18 12:37 ` Hans Verkuil
2022-02-18 12:37 ` Hans Verkuil
2022-02-18 12:37 ` Hans Verkuil
2022-02-18 12:37 ` Hans Verkuil
2022-03-02 7:30 ` Pavel Machek
2022-03-02 7:30 ` Pavel Machek
2022-03-02 7:30 ` Pavel Machek
2022-03-02 7:30 ` Pavel Machek
2022-01-25 9:30 ` [PATCH 0/5] " Lee Jones
2022-01-25 9:30 ` Lee Jones
2022-01-25 9:30 ` Lee Jones
2022-01-25 9:30 ` Lee Jones
2022-02-09 14:34 ` Mark Brown
2022-02-09 14:34 ` 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=20220123175201.34839-2-u.kleine-koenig@pengutronix.de \
--to=u.kleine-koenig@pengutronix.de \
--cc=broonie@kernel.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=gregkh@linuxfoundation.org \
--cc=hkallweit1@gmail.com \
--cc=kernel@pengutronix.de \
--cc=linux-fbdev@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-spi@vger.kernel.org \
--cc=linux-staging@lists.linux.dev \
--cc=notro@tronnes.org \
--cc=thomas.petazzoni@bootlin.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.