summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-05-03 13:56:37 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-05-13 17:30:18 +0200
commitb0a85abbe92e1a6f3e8580a4590fa7245de7090b (patch)
treecca4477c1854ca20c55dfb0a93e64468a9a4c312
parent6647f7a06eb030a2384ec71f0bb2e78854afabfe (diff)
downloadlinux-b0a85abbe92e1a6f3e8580a4590fa7245de7090b.tar.gz
linux-b0a85abbe92e1a6f3e8580a4590fa7245de7090b.tar.bz2
linux-b0a85abbe92e1a6f3e8580a4590fa7245de7090b.zip
Revert "serial: max310x: pass return value of spi_register_driver"
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>
-rw-r--r--drivers/tty/serial/max310x.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/tty/serial/max310x.c b/drivers/tty/serial/max310x.c
index 8534d6e45a1d..a3ba0e6520a1 100644
--- a/drivers/tty/serial/max310x.c
+++ b/drivers/tty/serial/max310x.c
@@ -1518,10 +1518,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);