Skip to content

Commit 426aca1

Browse files
Uwe Kleine-Königgregkh
authored andcommitted
staging: fbtft: Fix error path in fbtft_driver_module_init()
If registering the platform driver fails, the function must not return without undoing the spi driver registration first. Fixes: c296d5f ("staging: fbtft: core support") Signed-off-by: Uwe Kleine-König <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 0cea730 commit 426aca1

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

drivers/staging/fbtft/fbtft.h

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,10 @@ static int __init fbtft_driver_module_init(void) \
334334
ret = spi_register_driver(&fbtft_driver_spi_driver); \
335335
if (ret < 0) \
336336
return ret; \
337-
return platform_driver_register(&fbtft_driver_platform_driver); \
337+
ret = platform_driver_register(&fbtft_driver_platform_driver); \
338+
if (ret < 0) \
339+
spi_unregister_driver(&fbtft_driver_spi_driver); \
340+
return ret; \
338341
} \
339342
\
340343
static void __exit fbtft_driver_module_exit(void) \

0 commit comments

Comments
 (0)