git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'icc-5.2-rc1' of https://git.linaro.org/people/georgi.djakov/linux into...
[sfrench/cifs-2.6.git]
/
drivers
/
tty
/
serial
/
sc16is7xx.c
diff --git
a/drivers/tty/serial/sc16is7xx.c
b/drivers/tty/serial/sc16is7xx.c
index 09a183dfc52640027bf571184ee4e69e819c5951..a31db15cd7c0d36bf2e4dee32d7b1201bc2674c5 100644
(file)
--- a/
drivers/tty/serial/sc16is7xx.c
+++ b/
drivers/tty/serial/sc16is7xx.c
@@
-1520,11
+1520,13
@@
static int __init sc16is7xx_init(void)
#endif
return ret;
+#ifdef CONFIG_SERIAL_SC16IS7XX_SPI
err_spi:
+#endif
#ifdef CONFIG_SERIAL_SC16IS7XX_I2C
i2c_del_driver(&sc16is7xx_i2c_uart_driver);
-#endif
err_i2c:
+#endif
uart_unregister_driver(&sc16is7xx_uart);
return ret;
}