]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
Revert "serial: max310x: pass return value of spi_register_driver"
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 3 May 2021 11:56:37 +0000 (13:56 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 3 Jun 2021 06:59:08 +0000 (08:59 +0200)
[ Upstream commit b0a85abbe92e1a6f3e8580a4590fa7245de7090b ]

This reverts commit 51f689cc11333944c7a457f25ec75fcb41e99410.

Because of recent interactions with developers from @umn.edu, all
commits from them have been recently re-reviewed to ensure if they were
correct or not.

Upon review, this commit was found to be incorrect for the reasons
below, so it must be reverted.  It will be fixed up "correctly" in a
later kernel change.

This change did not properly unwind from the error condition, so it was
not correct.

Cc: Kangjie Lu <kjlu@umn.edu>
Acked-by: Jiri Slaby <jirislaby@kernel.org>
Link: https://lore.kernel.org/r/20210503115736.2104747-11-gregkh@linuxfoundation.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/tty/serial/max310x.c

index 8434bd5a8ec78e1cd1e9f0834b09a5c131845503..f60b7b86d0991e1f2d8ab63028c8c8a4d18dcbd3 100644 (file)
@@ -1527,10 +1527,10 @@ static int __init max310x_uart_init(void)
                return ret;
 
 #ifdef CONFIG_SPI_MASTER
-       ret = spi_register_driver(&max310x_spi_driver);
+       spi_register_driver(&max310x_spi_driver);
 #endif
 
-       return ret;
+       return 0;
 }
 module_init(max310x_uart_init);