diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2021-05-21 15:59:23 -0300 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2021-05-21 15:59:23 -0300 |
| commit | f248d687e99da6799a25bbf53ca1350b84d41077 (patch) | |
| tree | edb0b90c039e34e838329ca4d96e9888a4ebfa34 /drivers/tty/serial/max310x.c | |
| parent | 3b2f17ad1770e51b8b4e68b5069c4f1ee477eff8 (diff) | |
| parent | 011ff616ffe8df6b86ee54d14a43c8d1a96a6325 (diff) | |
| download | linux-f248d687e99da6799a25bbf53ca1350b84d41077.tar.bz2 | |
Merge remote-tracking branch 'torvalds/master' into perf/urgent
To pick up more UAPI updates to sync with tools/.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'drivers/tty/serial/max310x.c')
| -rw-r--r-- | drivers/tty/serial/max310x.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/tty/serial/max310x.c b/drivers/tty/serial/max310x.c index 8534d6e45a1d..3cbc757d7be7 100644 --- a/drivers/tty/serial/max310x.c +++ b/drivers/tty/serial/max310x.c @@ -1519,6 +1519,8 @@ static int __init max310x_uart_init(void) #ifdef CONFIG_SPI_MASTER ret = spi_register_driver(&max310x_spi_driver); + if (ret) + uart_unregister_driver(&max310x_uart); #endif return ret; |