Home Home > GIT Browse > SLE12-SP4-AZURE
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2019-05-14 10:51:30 +0200
committerTakashi Iwai <tiwai@suse.de>2019-05-14 10:51:34 +0200
commit4c41057970bc32ecfaa11643f7e5e8dd78c0d484 (patch)
tree9be3fa8a2097f83517b00e4c94a0f5191a0a24c0
parent52dfec56da0f37960e522d6788931c972ee2071e (diff)
sc16is7xx: put err_spi and err_i2c into correct #ifdef
(bsc#1051510). suse-commit: ef2d000e93ef42b4d72e24e448a5f948720ac757
-rw-r--r--drivers/tty/serial/sc16is7xx.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/tty/serial/sc16is7xx.c b/drivers/tty/serial/sc16is7xx.c
index 1d13538a37f4..8885e999160e 100644
--- a/drivers/tty/serial/sc16is7xx.c
+++ b/drivers/tty/serial/sc16is7xx.c
@@ -1501,11 +1501,11 @@ static int __init sc16is7xx_init(void)
#ifdef CONFIG_SERIAL_SC16IS7XX_SPI
err_spi:
+#endif
#ifdef CONFIG_SERIAL_SC16IS7XX_I2C
i2c_del_driver(&sc16is7xx_i2c_uart_driver);
-#endif
-#endif
err_i2c:
+#endif
uart_unregister_driver(&sc16is7xx_uart);
return ret;
}