Skip to content

Commit

Permalink
Revert "serial: max310x: pass return value of spi_register_driver"
Browse files Browse the repository at this point in the history
[ Upstream commit b0a85ab ]

This reverts commit 51f689c.

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>
  • Loading branch information
gregkh committed Jun 3, 2021
1 parent 6bbcc12 commit f7d0b85
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/tty/serial/max310x.c
Expand Up @@ -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);

Expand Down

0 comments on commit f7d0b85

Please sign in to comment.