projects
/
platform
/
kernel
/
linux-rpi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
26291c5
)
staging: fbtft: Fix error path in fbtft_driver_module_init()
author
Uwe Kleine-König
<u.kleine-koenig@pengutronix.de>
Sun, 23 Jan 2022 17:51:57 +0000
(18:51 +0100)
committer
Mark Brown
<broonie@kernel.org>
Wed, 9 Feb 2022 13:00:40 +0000
(13:00 +0000)
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>
Acked-by: Lee Jones <lee.jones@linaro.org>
Link:
https://lore.kernel.org/r/20220123175201.34839-2-u.kleine-koenig@pengutronix.de
Signed-off-by: Mark Brown <broonie@kernel.org>
drivers/staging/fbtft/fbtft.h
patch
|
blob
|
history
diff --git
a/drivers/staging/fbtft/fbtft.h
b/drivers/staging/fbtft/fbtft.h
index
4cdec34
..
55677ef
100644
(file)
--- 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) \