diff options
| author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2022-01-18 21:13:37 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-02-16 14:44:50 +0300 |
| commit | 13931dc34ef2b9f680241c62a6dd8eb77c540f58 (patch) | |
| tree | e69dbcc1f0a501414c4363946df2b8ce5a6b710a | |
| parent | 23dfa42a0a2a91d640ef3fce585194b970d8680c (diff) | |
| download | linux-13931dc34ef2b9f680241c62a6dd8eb77c540f58.tar.xz | |
staging: fbtft: Fix error path in fbtft_driver_module_init()
[ Upstream commit 426aca16e903b387a0b0001d62207a745c67cfd3 ]
If registering the platform driver fails, the function must not return
without undoing the spi driver registration first.
Fixes: c296d5f9957c ("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>
| -rw-r--r-- | drivers/staging/fbtft/fbtft.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/staging/fbtft/fbtft.h b/drivers/staging/fbtft/fbtft.h index 488ab788138e..b086e8e5b4dd 100644 --- a/drivers/staging/fbtft/fbtft.h +++ b/drivers/staging/fbtft/fbtft.h @@ -342,7 +342,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) \ |