diff options
author | Guoqing Jiang <gqjiang@suse.com> | 2019-04-17 22:01:55 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-04-19 08:09:23 -0400 |
commit | c53051128bb0e8754e13345d782ca69e5e1ce36d (patch) | |
tree | 328405d8eed2c69ca66fb28b1cc113b4527b6ae0 | |
parent | b2ecf00631362a83744e5ec249947620db5e240c (diff) |
sc16is7xx: put err_spi and err_i2c into correct #ifdef
err_spi is only called within SERIAL_SC16IS7XX_SPI
while err_i2c is called inside SERIAL_SC16IS7XX_I2C.
So we need to put err_spi and err_i2c into each #ifdef
accordingly.
This change fixes ("sc16is7xx: move label 'err_spi'
to correct section").
Signed-off-by: Guoqing Jiang <gqjiang@suse.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/tty/serial/sc16is7xx.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/tty/serial/sc16is7xx.c b/drivers/tty/serial/sc16is7xx.c index 22381a8c72e4..a31db15cd7c0 100644 --- a/drivers/tty/serial/sc16is7xx.c +++ b/drivers/tty/serial/sc16is7xx.c | |||
@@ -1522,11 +1522,11 @@ static int __init sc16is7xx_init(void) | |||
1522 | 1522 | ||
1523 | #ifdef CONFIG_SERIAL_SC16IS7XX_SPI | 1523 | #ifdef CONFIG_SERIAL_SC16IS7XX_SPI |
1524 | err_spi: | 1524 | err_spi: |
1525 | #endif | ||
1525 | #ifdef CONFIG_SERIAL_SC16IS7XX_I2C | 1526 | #ifdef CONFIG_SERIAL_SC16IS7XX_I2C |
1526 | i2c_del_driver(&sc16is7xx_i2c_uart_driver); | 1527 | i2c_del_driver(&sc16is7xx_i2c_uart_driver); |
1527 | #endif | ||
1528 | #endif | ||
1529 | err_i2c: | 1528 | err_i2c: |
1529 | #endif | ||
1530 | uart_unregister_driver(&sc16is7xx_uart); | 1530 | uart_unregister_driver(&sc16is7xx_uart); |
1531 | return ret; | 1531 | return ret; |
1532 | } | 1532 | } |