xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

staging: fbtft: Fix error path in fbtft_driver_module_init()

Browse Source 
[ Upstream commit 426aca16e903b387a0b0001d62207a745c67cfd3 ]

If registering the platform driver fails, the function must not return
without undoing the spi driver registration first.

Fixes: c296d5f995 ("staging: fbtft: core support")
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Link: https://lore.kernel.org/r/20220118181338.207943-1-u.kleine-koenig@pengutronix.de
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Uwe Kleine-König
2022-01-18 19:13:37 +01:00
committed by Greg Kroah-Hartman
parent 74cd5cb219
commit 0a7b5e8d8c
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/staging/fbtft/fbtft.h
View File

@@ -332,7 +332,10 @@ static int __init fbtft_driver_module_init(void) \
ret = spi_register_driver(&fbtft_driver_spi_driver); \ ret = spi_register_driver(&fbtft_driver_spi_driver); \
if (ret < 0) \ if (ret < 0) \
return ret; \ 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) \ static void __exit fbtft_driver_module_exit(void) \